From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2012 17:58:49 GMT
Subject: Re: [RFC/PATCH] Option to revert order of parents in merge commit
Message-ID: <7v8v9otfdy.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20121126124200.GA29859@camk.edu.pl>

Kacper Kornet <draenog@pld-linux.org> writes:

>> Is there any interaction between this "pull --reverse-parents"
>> change and possible conflict resolution when the command stops and
>> asks the user for help?  For example, whom should "--ours" and "-X
>> ours" refer to?  Us, or the upstream?
>
> The change of order of parents happens at the very last moment, so
> "ours" in merge options is local version and "theirs" upstream.

That may be something that wants to go to the proposed commit log
message.  I am neutral on the "feature" (i.e. not against it but not
extremely enthusiastic about it either).

Thanks.