Re: bogus merges

From: A Large Angry SCM <gitzilla@gmail.com>
Date: Sep 11, 2005, 15:11 UTC
Message-ID: <43244935.6060703@gmail.com>
In-Reply-To: <46a038f905091104483cc01a11@mail.gmail.com>

Martin Langhoff wrote:

Show 11 quoted lines

> On 9/11/05, Russell King <rmk@arm.linux.org.uk> wrote:
>>On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:
>>>I suspect rmk is using cogito-0.13
>>Correct, and rmk will probably be extremely nervous about upgrading when
>>0.14 appears.
> 
> Well, *actually* cogito-0.13 didn't include git-core, so we have to
> look for the reasons elsewhere. Could be the leftover MERGE_HEAD
> Daniel mentions.
> 
> Russel, can you confirm what git-core version you are/were running?

Russel,

How are you updating your tree to Linus'? If you are rsyncing from kernel.org, you're probably getting a MERGE_HEAD with the rsync. A while ago I got annoyed enough add the equivalent of:

	rm -f ${LOCAL_REPOS}/.git/MERGE_HEAD

to my (very stupid) git rsync script.