title: Conflict error while using revert command on a single-branch git tree
body: <p>When I try to use simple <code>git revert &lt;SHA_of_my_commit&gt;</code> to return to a particular commit, I receive the following error message.</p>
  <pre><code>Auto-merging file1.txt
  CONFLICT (content): Merge conflict in file1.txt
  error: could not revert 96882d9... second commit t2
  hint: after resolving the conflicts, mark the corrected paths
  hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths&gt;'
  hint: and commit the result with 'git commit'
  </code></pre>
  <p>This is the result of git log:
  <a href="https://i.stack.imgur.com/fSAsl.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/fSAsl.png" alt="enter image description here" /></a></p>
  <p>No matter what commit I intend to come back to, I receive the same error message. How could I fix this error?</p>