title: Git Pull is Not Possible, Unmerged Files
body: <p>I've read all of the similar questions on this; it seems that none of the following have worked:</p>
  
  <pre><code>Delete offending files
  git reset --hard HEAD
  git stash
  git pull
  </code></pre>
  
  <p>Nearly every combination, stashing changes and pulling from repository, results in unmergable files. I'd like to discard all local changes and just use the remote, but I cannot clone again (bandwidth and internet usage limitations with the developer trying to do this). How do I do this? </p>
  
  <p>Just tried:</p>
  
  <pre><code>git stash
  git pull
  </code></pre>
  
  <p>Also did not work.</p>
  
  <p><strong>More Info</strong></p>
  
  <p>There is one local commit, and the upstream has a commit as well. I've thus tried <code>git pull --rebase</code> but it's still not working properly... That gives me errors - "exiting because of an unresolved conflict". If I do <code>git stash, git reset --hard HEAD, git pull --rebase</code>, I get the error "pull is not possible, unmerged changes..." </p>