title: Cleaning up after a conflicted git merge?
body: <p>I had a small conflict in a <code>.h</code> header file in a project I'm working on. This project is tracked in Git.</p>
  
  <p>Fortunately, the conflict was very simple to solve. I used</p>
  
  <p><code>git mergetool</code></p>
  
  <p>And chose the default (<code>opendiff</code>) which seemed to be FileMerge on my Mac. I made the appropriate changes, saved the file, and closed.</p>
  
  <p>Git then asked me if the merge was successful, I said yes:</p>
  
  <p><code>Was the merge successful? [y/n] y</code></p>
  
  <p>But now, I have:</p>
  
  <pre><code>&gt; git st
  # On branch develop
  # Changes to be committed:
  #   modified:   MyHeader.h
  #
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #   MyHeader.h.BACKUP.52920.h
  #   MyHeader.h.BASE.52920.h
  #   MyHeader.h.LOCAL.52920.h
  #   MyHeader.h.REMOTE.52920.h
  #   MyHeader.h.orig
  </code></pre>
  
  <p>Which of those extra junk conflict files were created by FileMerge, and which by Git?</p>
  
  <p><em><strong>And more importantly:</em> How do I remove them?</strong></p>