title: Undo a git merge that has just been pushed and redo the merge
body: <p>I had some local commits and there were changes made on master. So I did a:</p>
  
  <pre><code> git pull // it automatically merged and had a conflict with one file only.
   subl &lt;file&gt; // Made the wrong fix and saved it
   git commit // It opened nano and I Typed "fixed merge" saved it 
   git push master origin
  </code></pre>
  
  <p>How do I go back to before the pull and redo the merge and push? Especially get back to right before the merge.</p>