title: Change direction of git merge (after the merge is done)
body: <p>I have a branch (e.g. Feature-X) in a git repo.</p>
  
  <p>What I did was the following</p>
  
  <pre><code>git checkout master
  git merge Feature-X
  </code></pre>
  
  <p>There were quite a few conflicts which I resolved. I haven't committed the changes yet.</p>
  
  <p>But, it turns out what I wanted was to do the reverse merge (i.e. merge master into Feature-x) because the branch is probably still unstable.</p>
  
  <p>Is there any command that can salvage the work I did in resolving the conflicts or do I need to do the resolution once more, this time in the branch Feature-X?</p>
  
  <p>I'm thinking whether there is a way to get the current patch but apply it in branch Feature-X in the "reverse" order. E.g. when the patch says that line X changed to Y, this is relative to Feature-X going to master. If I want to do the opposite, the patch should say that line Y changed to X, right? This is just my thoughts. Any solution is OK.</p>