Re: Unexpected cherry-pick behaviour

From: Antoine Pelisse <apelisse@gmail.com>
Date: Dec 11, 2013, 11:09 UTC
Message-ID: <CALWbr2zPPnDiv7oVBhnM9dSW=pfz2jUA_A5u_gk2ttgXTStvkw@mail.gmail.com>
In-Reply-To: <7050e7272bb83d083a56a2c391228ed8@matos-sorge.com>

On Wed, Dec 11, 2013 at 11:04 AM, Paulo Matos <paulo@matos-sorge.com> wrote:

Show 12 quoted lines

> On 10/12/2013 19:34, Junio C Hamano wrote:
>>
>> Perhaps immediately after "cherry-pick" stopped and asked your help
>> to resolve the conflicts, running
>>
>>         $ git checkout --conflicts=diff3 gcc/tree-ssa-threadedge.c
>>
>> and looking at the file again may show you what is going on better.
>
>
> I don't know how to interpret the fact that the line you sent (with the
> obvious --conflicts being --conflict) outputs nothing...

That is expected. git-checkout with this option [1] will reset the conflict on gcc/tree-ssa-threadedge.c file to the initial conflict state, and use the diff3 markers. You should have a new look at that file as you will now be able to see the "ancestor" in the conflict.

[1] You can have a look either at git-checkout manpage or here: http://git-scm.com/docs/git-checkout, especially --merge and --conflict options.