title: Git (Extensions) - undoing branch merge /hard reset and doing it properly
body: <p>Right, this may sound like a bit of an odd question, but I think I've done something stupid.</p>
  
  <p>I had two different branches (with a very small number of changes), and I wanted to merge SOME changes from one to the other.  So, in Git Extensions, I went Commands > Merge Branches.</p>
  
  <p>Unfortunately, rather than giving me the option to manage merge conflicts, it just went through it automatically after hitting OK.  As this was not what I wanted, I attempted to find a way to try and roll it back.</p>
  
  <p>What I ended up doing was selecting the last Commit for one of the branches (before the merge, but the latest Commit out of either branch) and hard resetting back to it.</p>
  
  <p>Rather than restoring things to their previous state (ie the merge not having taken place), I am instead left with what appears to be the single red line in git extensions of both branches each being the same, AND the latest version (ie post-merge).  I can still switch between the two branches, but there's no apparent difference between them.</p>
  
  <p>So this is basically what I wanted to do (I apologise for the crudity of this diagram, I'm not really sure how best to display it):</p>
  
  <pre><code>Branch 1
     x---------------y
            \
             \ 
     x--------x------y
  Branch 2
  </code></pre>
  
  <p>I have changes I wanted to merge from Branch 1 into Branch 2, but I wanted to keep them both separate, AND I didn't want to merge ALL the changes.</p>
  
  <p>Can my mistakes I've made above be reverted?  And what would have been the correct way to do this?</p>