title: Git is duplicating code
body: <p>We just switched from Subversion to Git.</p>
  
  <p>The problem that came up this morning was that we cherry-picked a commit from a branch into master so maser would have a bug fix.  Then we merged master back to the branch.</p>
  
  <p>When we tried to compile, all of the additions from the cherry-picked commit were in the code twice.</p>
  
  <p>The cherry-picked commit consisted of the addition of a couple of lines of code, which ended up afterward being in the code twice.  Luckily they were entire functions so it threw a compiler error.</p>
  
  <p>There was never a conflict raised.</p>
  
  <p>How do we avoid this.  It's a major problem.</p>
  
  <p>Thanks.</p>