title: How does Git solve the merging problem?
body: <p>SVN made branching much easier by making branches really cheap, but merges remain a real problem in SVN - one that Git supposedly solves.</p>
  
  <p>Does Git achieve this, and how?</p>
  
  <p>(disclaimer: All I know about Git is based on the Linus lecture - total git noob here)</p>