title: Git Overwrite Error on push for certain file: Why won't git push --force or git stash work?
body: <p>I'm trying to push a file change via git. I added and committed the file just as I would do for any other push.  However, when I push I get this error:
  <code>
  remote: error: Your local changes to the following files would be overwritten by merge:
  remote:         filename.html
  remote: Please, commit your changes or stash them before you can merge.
  remote: Aborting</code></p>
  
  <p>The thing is, I did commit the changes.  I tried to redo the edits and ran through the add/commit process a few times, and every time I push I get the same error. Any idea how to fix?</p>
  
  <p>I've tried to force the push with <code>git push --force origin branch</code> and <code>git push origin branch --force</code>.  Still the same error.</p>
  
  <p>I tried to stash the changes its referencing in the error with <code>git stash</code> and it says <code>No local changes to save</code>. </p>
  
  <p>I tried <code>git reset --hard origin/master</code>.  Still the same error when trying to push that specific file.  I have no problems push other files, just this one.  </p>
  
  <p>I'd like to be able to push changes to this file, I'm just not sure how to get past this error.  Any help would be appreciated.</p>
  
  <p>Here is the complete text I get when I try to push: </p>
  
  <p><code>
  Enumerating objects: 9, done.
  Counting objects: 100% (9/9), done.
  Delta compression using up to 4 threads
  Compressing objects: 100% (5/5), done.
  Writing objects: 100% (5/5), 418 bytes | 418.00 KiB/s, done.
  Total 5 (delta 4), reused 0 (delta 0)
  remote:
  remote: **** Pulling changes into Live [Hub's post-update hook]
  remote:
  remote: From /var/git/html
  remote:  * branch            master     -&gt; FETCH_HEAD
  remote: error: Your local changes to the following files would be overwritten by merge:
  remote:         filename.html
  remote: Please, commit your changes or stash them before you can merge.
  remote: Aborting
  remote: Updating fb7c657..b64906e
  To website.com:/var/git/html.git
     bf653d3..b64906e  master -&gt; master</code></p>