title: Resolve merge conflicts: Force overwrite all files
body: <p>I am working on a git repository <em>by myself</em> (so yes, I know the implications and the warnings of doing this) and somehow one of the trees got a commit after being pushed when it shouldn't have.</p>
  
  <p>Now I'm trying to pull back and it's complaining about hundreds of merge conflicts.</p>
  
  <p>Is there a way to tell git to <em>forcefully</em> overwrite any and all files locally that are coming from the remote server? Is there a faster way than doing <code>git reset --hard HEAD~1</code> and then doing the pull?</p>
  
  <p>On that same note, is there a way to do the same with with a simple merge? Everything I've seen suggests to check out each and every file during the merge conflict resolution stage, but with hundreds of files it's just not possible to do so manually.</p>