title: Git merge error "commit is not possible because you have unmerged files"
body: <p>I forgot to <code>git pull</code> my code before editing it; when I committed the new code and tried to push, I got the error &quot;push is not possible&quot;.</p>
  <p>At that point I did a <code>git pull</code> which made some files with conflict highlighted. I removed the conflicts but I don't know what to do from here.</p>
  <p>I tried to <code>git commit</code> again but it says the &quot;commit is not possible because you have unmerged files&quot;:</p>
  <blockquote>
  <pre><code>error: Committing is not possible because you have unmerged files.
  </code></pre>
  </blockquote>