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

There's a couple of ways to fix this but I've found git stash works good for me. It temporary puts your local changes into another place. Then you can pull, to grab the latest changes. And then you can get your local changes back.

Just like this:

$ git pull
...
...
file your_file.rb not up to date, cannot merge.

$ git stash
$ git pull
$ git stash pop