From: Miklos Vajna <vmiklos@frugalware.org>
Date: Wed, 30 Jul 2008 17:25:32 GMT
Subject: Re: [PATCH 3/4] Add a new test for using a custom merge strategy
Message-ID: <20080730172532.GF32057@genesis.frugalware.org>
In-Reply-To: <7vabg09rye.fsf@gitster.siamese.dyndns.org>

On Tue, Jul 29, 2008 at 04:43:53PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> By the way, this eval shows why "theirs" cannot be a symmetric operation
> of "ours".  You are taking the last remote HEAD even when you are merging
> more than one remote into the current branch at once.  "ours" can be
> sensibly defined for an octopus, but "theirs" has this "which theirs"
> problem ;-)

Oh, well, sure. But _if_ it turns out there is a demand for that kind of
git-merge-theirs, then I suppose we could still give up if we are given
two or more remotes, just like merge-resolve and others do.