From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 12 Jul 2006 22:39:28 GMT
Subject: Re: git-read-tree: fatal: Entry 'Kbuild' not uptodate. Cannot merge.
Message-ID: <Pine.LNX.4.64.0607121538300.5623@g5.osdl.org>
In-Reply-To: <44B57932.4090708@gentoo.org>



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