From: Junio C Hamano <junkio@cox.net>
Date: Fri, 02 Dec 2005 01:58:21 GMT
Subject: Re: resolve (merge) problems
Message-ID: <7vpsog9s5e.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051202015039.93047.qmail@web31811.mail.mud.yahoo.com>

Luben Tuikov <ltuikov@yahoo.com> writes:

> Ok, if your patch below resolves the bug (please see my
> other email just posted) please submit it.  (I'm hitting
> this bug everytime there's a file deleted from the
> kernel tree and I try to merge.)

Sorry to hear that.  The patch I sent you is already pushed out
and mirrored the public machines.

The failure from '-s recursive' (lack of heapq) makes me suspect
that your Python installation is too old.  The 'resolve' method
you've been using should work fine for this case; otherwise
replace '-s recursive' in the message from Linus with '-s
resolve' for the 'git merge' commandline, like this:

	$ git merge -s resolve "merge linus' tree" HEAD master