title: What should I do when git revert aborts with an error message?
body: <p>OK, so I'm getting an error sometimes when I try to revert a commit (with Git). All that I do is</p>
  
  <p><code>git revert &lt;commit hash&gt;</code></p>
  
  <p>and it gives me this message:</p>
  
  <pre><code>error: could not revert &lt;commit hash&gt; &lt;commit message&gt;
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths&gt;'
  </code></pre>
  
  <p>Does this mean that I should use <code>git mergetool</code> and resolve any conflicts? Once I do this can I add/rm and then commit, and the revert is complete?</p>