Why do I sometimes see an "Entry 'filename' not uptodate. Cannot merge." after a 'git reset --hard' and a 'git pull'?

git merge reset pull
James Bobowski picture James Bobowski · May 18, 2009 · Viewed 21.6k times · Source

Occasionally, when I do the following...

git reset --hard
HEAD is now at 0123abde comment is here
git pull
Updating 0123abde..456789fa

I get the error...

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

The only workaround I have found is to 'git reset --hard', delete the offending file(s) then do 'git pull'. That doesn't seem right to me. Shouldn't a hard reset remove any and all local changes thus allowing me to pull the latest without any merge issues? Am I using git wrong? :)

This is on a CI machine so any changes here are unwanted. I'm using git version 1.6.1.9.g97c34 on Windows Vista.

Answer

Christophe Moine picture Christophe Moine · Dec 20, 2018

The easiest solution I have found to this problem is:

git add .
git merge --abort

Related questions

What's the difference between git reset --hard and git reset --merge

In my experiments I haven't been able to find any functional difference between git reset --hard and git reset --merge The usage instructions don't give any hint either --hard reset HEAD, index and working tree --merge reset HEAD, index and …

Read More
Reset/revert a whole branch to another branches state?

I have a branch A and a branch B (and some other branches). Lets say A's commit history looks like: commit 5 commit 4 commit 3 ... And B's commit history: some other commit commit 4 merge of other stuff from branch C (into branch …

Read More
Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone …

Read More