title: Really, a concrete example that merging in Git is easier than SVN?
body: <p>Stack Overflow question <em><a href="https://stackoverflow.com/questions/2471606/how-and-or-why-is-merging-in-git-better-than-in-svn">How and/or why is merging in Git better than in SVN?</a></em> is a great question with some <strong>great answers</strong>. However none of them show a simple example where merging in Git works better than <a href="http://en.wikipedia.org/wiki/Apache_Subversion" rel="nofollow noreferrer">SVN</a>.</p>
  
  <p>On the chance this question will be closed as a duplicate, what is</p>
  
  <ol>
  <li>A concrete merge scenario</li>
  <li>How it is difficult in SVN?</li>
  <li>How the same merge is easier in Git?</li>
  </ol>
  
  <p>A few points:</p>
  
  <ul>
  <li>No philosophy or deep explanations of what a DVCS is please. These are great, really, but I don't want their details to obfuscate the answer to this (IMHO) important</li>
  <li>I don't care about "historic SVN" at the moment. Please compare modern Git (1.7.5) to modern SVN (1.6.15).</li>
  <li>No renames please - I know that Git detects renames and moves, while SVN doesn't. This is great, but I am looking for something deeper, and example that doesn't involve renames or moves.</li>
  <li>No rebase or other 'advanced' Git operation. Just show me the merge please.</li>
  </ul>