title: I'm not able to revert a file while it's conflicting. git
body: <p>Here is what I've done:</p>
  
  <ul>
  <li>Create folder testA</li>
  <li>Create a file "a.txt" with it's contents "a"</li>
  <li>Git init into the folder testA</li>
  <li>git add .</li>
  <li>git commit -a -m "first"</li>
  <li>change the file's "a.txt" contents to "b"</li>
  <li>git add .</li>
  <li>git commit -a -m "changed to b"</li>
  <li>git log (to get the commit id of the "first" )</li>
  <li>git revert a90deafe08c9f8f0d7b94d3d74d40be2bd65b161</li>
  </ul>
  
  <p>I get in console:</p>
  
  <pre><code>error: could not revert a90deaf... first
  hint: after resolving the conflicts, mark the
  hint: with 'git add &lt;paths&gt;' or 'git rm &lt;paths
  hint: and commit the result with 'git commit'
  </code></pre>
  
  <p>Well, I would like to have all the files at the state of the previous commit, what should I do know?</p>
  
  <p>UPDATE
  <strong>What I would want:</strong></p>
  
  <ul>
  <li>I would like to keep the "changed to b" commit and have a third one that is exactly the same as the "first" commit. I never ever want to lose any file.</li>
  <li>To work with binary files (see next point)</li>
  <li>I don't care how binary files are manage as long as I can have them in the state of the commit, so merge is not necessary in this case. I just want something easier: replace file A from commit X to commit Y, no complications with merge needed.</li>
  </ul>