git push merge error, but git pull is already up-to-date. Tried reclone, same problem

Question

I do:

$ git commit .
$ git push
error: Entry \'file.php\' not uptodate. Cannot merge.

Then I do

$ git pull
Already up-to-date.
         


        

Answer 1

Try doing a git checkout file.php then git push again.

Update:

• git pull tells the branch is up-to-date?
• git status doesn't show any unmerged file?
• git commit works?

If you answered yes to all above, and your git push keeps failing even after a clean copy of the remote repository (read git clone), it's very likely the remote repository has an index problem.