title: What's the difference between SVN and Git for merging?
body: <p>As the title suggests, I am curious as to why so many people tout Git as a superior alternative to branching/merging over SVN. I am primarily curious because SVN merging sucks and I would like an alternative solution.</p>
  
  <p>How does Git handle merging better? How does it work?</p>
  
  <p>For example, in SVN, if I have the following line:</p>
  
  <p>Hello World!</p>
  
  <p>Then user1 changes it to:</p>
  
  <p>Hello World!1</p>
  
  <p>then user2 changes it to:</p>
  
  <p>Hello World!12</p>
  
  <p>Then user2 commits, then user1 commits, SVN would give you a conflict. Can Git resolve something simple as this?</p>