Git pull: error: Entry foo not uptodate. Cannot merge

Question

I\'m trying to update my repo from a remote branch and keep getting this error when I do a \"git pull\". I haven\'t made any local changes, and even if I have I don\'t need

Answer 1

I was seeing a similar issue (Windows 10): I was on branchA and wanted to go to master. I had some uncommited changes so first I git stash then git checkout -f master but I still got the Entry 'fileName' not uptodate. Cannot merge.

git status wasn't showing anything to commit.

Eventually I just removed the file manually and I was able to go to the other branch (which of course made my file come back) so I guess there has been a bug within git somewhere.