title: Why do I get conflicts when I do git revert?
body: <p>I use Git, and I know that:</p>
  <pre><code>git revert &lt;hash-code&gt;
  </code></pre>
  <p>is used to create a new commit that will be identical to the past commit in the hash-code.</p>
  <p>For example, I have the following commits:</p>
  <pre><code>1f74a0e second commit
  e72d8b8 first commit  
  </code></pre>
  <p>I wanted to revert the first commit, so I used:</p>
  <pre><code>git revert 1f74a0e
  </code></pre>
  <p>Still, I got the following error:</p>
  <blockquote>
  <p>error: could not revert 1f74a0e... first commit hint: after resolving
  the conflicts, mark the corrected paths hint: with 'git add '
  or 'git rm ' hint: and commit the result with 'git commit'</p>
  </blockquote>
  <p>As for the conflicts, I type:</p>
  <pre><code>$ git diff --name-only --diff-filter=U
  file.txt
  </code></pre>
  <p>When I open file.txt I see no signs for conflicts.</p>
  <p>Of course there will be conflicts. I expect git to take the &quot;first commit&quot; and copy it on top of the second commit. How can I do it?</p>