title: Git: currently in merge/conflict with private remote repo. How to tell Git to just use my local files?
body: <p>Trying to use/learn git with a personal project. There's only me and a remote git repo, a few commits, and I'm stuck in a failed merge. A lot of my files have Git merge conflict markup now too.</p>
  
  <p>How do I tell git to just throw everything out, just use mine?</p>
  
  <p>A specific example of how I got into the state I'm in:</p>
  
  <pre><code>echo A new file &gt; myFile.txt             # example file
  git add myFile.txt                       # add file
  git commit                               # commit changes
  git push                                 # push changes to remote repo
  echo A conflicting edit &gt; myFile.txt     # oh, no, forgot some changes
  git add myFile.txt                       # add again
  git commit --amend                       # amend previous commit
  git push                                 # fails. Git suggests to do a pull first
  git pull origin HEAD                     # "Automatic merge failed" Now what?
                                           # Just use what I have locally!
  </code></pre>