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

Are you sure you didn't have already a file.php with a different case? (File.php or file.PHP...), as in this answer?

• one already commit
• one on your working directory, with a different case.