title: How to stop a merge (yet again....)
body: <p>How do I definitively stop Git from trying to merge? I <strong><em>never</em></strong> want it to merge.</p>
  
  <p>From <a href="https://stackoverflow.com/q/31312742">How to make Git honor a cancelled merge that was not asked for?</a>, I know the tool does not respect my cancellation by killing the editor it spins up without asking me. So now I just <code>kill -9</code> the terminal process.</p>
  
  <p>If I get into a situation where Git wants to merge, I always want the server's copy of the source file. I'll just delete the file locally and then fetch it again from the server.</p>
  
  <hr>
  
  <p>Right now, Git is DoS'ing me with this piece of goodness:</p>
  
  <blockquote>
    <p>You have not concluded your merge (MERGE_HEAD exists).<br>
    Please, commit your changes before you can merge.</p>
  </blockquote>
  
  <p>Of course, the <code>git reset HEAD &lt;file&gt;</code> did not work.</p>
  
  <p>And here's the best part: they are the <strong><em>exact</em></strong> same file. There are <strong><em>no</em></strong> differences between them. I make a change, I test it on 8 to 12 different platforms (copying with <code>scp</code>), and then I check it in on one of those boxes after testing. But from <a href="https://stackoverflow.com/q/31108960/608639">Tell Git to stop prompting me for conflicts when none really exist?</a>, I know the tool is too stupid to show any intelligence in this area.</p>
  
  <hr>
  
  <p>If you are wondering, there is one set of sources. They are the project's sources located on the remote server. All I want Git to do is checkout (clone), update (pull), tell me what has changed (diff) and checkin (push). I don't need any other features from the tool.</p>