title: Another option for Git revert
body: <p>I am having an issue where I am trying to use git revert to create a new commit that essentially duplicates an old commit a few steps back in the master branch. I've been stuck on this problem for quite a while as every time i try to run <code>git revert &lt;sha&gt;</code> i first get this error:</p>
  
  <pre><code>error: Your local changes would be overwritten by revert.
  hint: Commit your changes or stash them to proceed.
  fatal: revert failed`
  </code></pre>
  
  <p>I tried to add, commit, and push and try again but I get the same error and it keeps having me merge the same conflicts over and over. I tried git stash, but still no luck.</p>
  
  <pre><code>git stash
  Saved working directory and index state WIP on (no branch): &lt;branch&gt;
  git revert &lt;sha&gt;
  error: could not revert &lt;sha&gt; 
  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>At this point, I would just like to clone the repository at the commit I want as the current and add it as the head. I am trying to retain the history of my commits otherwise I would use git checkout.</p>
  
  <p>Any sugggestions would be greatly appreciated!</p>