title: Git "You have not concluded your merge" and nothing to commit?
body: <p>Whenever I try to push in Git I get this:</p>
  
  <pre><code>You have not concluded your merge (MERGE_HEAD exists).
  Please, commit your changes before you can merge.
  </code></pre>
  
  <p>Running <code>git status</code> I get:</p>
  
  <pre><code># On branch master
  nothing to commit (working directory clean)
  </code></pre>
  
  <p>Or running <code>git ls-files -u</code> I get nothing.</p>
  
  <p>Running <code>git add .</code>and trying again makes no difference.</p>
  
  <p>What's up?</p>