error: Entry 'xxxxxx' not uptodate. Cannot merge.

Ask:

I'm trying to update my repo from a remote branch and keep getting this error when I do a "git pull". as below,

xintan.chen@announce:~/ARM/m1-kernel$ git pull
Updating 59a968e..5f5a4e5
error: Entry 'drivers/amlogic/tvin/vdin.c' not uptodate. Cannot merge.

 

Answers:

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 

there is another method to fix it as below

xintan.chen@announce:~/ARM/m1-kernel$git checkout -f HEAD

xintan.chen@announce:~/ARM/m1-kernel$git pull

Already up-to-date.