title: I ran into a merge conflict. How do I abort the merge?
body: <p>I used <code>git pull</code> and had a merge conflict:</p>
  <pre><code>unmerged:   some_file.txt
  
  You are in the middle of a conflicted merge.
  </code></pre>
  <p>How do I abandon my changes to the file and keep only the pulled changes?</p>