Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:33


On Wed, 12 Jul 2006, Daniel Drake wrote:

git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.

$ git diff

diff --git a/Kbuild b/Kbuild
diff --git a/zd_chip.c b/zd_chip.c
diff --git a/zd_chip.h b/zd_chip.h

...

Do "git update-index --refresh", does it go away?

Although "git checkout -f" should also have done it (much more 
expensively)

		Linus