title: error: Reverting is not possible because you have unmerged files
body: <p>When trying to revert a specific commit in git, I'm getting this error:</p>
  
  <pre>$ git revert aaaf93201a28a57d540d633b1b723b8e513a47ed
  error: Reverting is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm '
  hint: as appropriate to mark resolution and make a commit.
  fatal: revert failed</pre>
  
  <p>Is this about merge conflicts? But why does it say "unmerged files" in that case?</p>