From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 20 Feb 2011 02:48:26 GMT
Subject: Re: [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD
Message-ID: <20110220024826.GB17547@elie>
In-Reply-To: <AANLkTik7cfihdu5-0pvgkq1u7kVShEqnjzh07T+5pU16@mail.gmail.com>

Hi,

Jay Soffian wrote:
> On Thu, Feb 17, 2011 at 3:01 PM, Junio C Hamano <gitster@pobox.com> wrote:

>> Micronit: "Please, commit your changes before you can merge."
>>
>>  - We are not merging in this codepath to begin with;
>>
>>  - I'd suggest rephrasing this (together with "MERGE_HEAD" codepath) to
>>   something like:
>>
>>        "Commit your changes first before retrying."
>
> This hunk is from Jonathan

I agree with what Jay said --- this is in cmd_merge, so the current
message is correct.  I like your wording ("before retrying") more, but
that seems orthogonal to the topic at hand.  I can send a patch
rephrasing it on top if someone reminds me.

> Okay. In that case, I think when using --no-commit, we shouldn't write
> CHERRY_PICK_HEAD regardless of whether there is a conflict or not.

Thanks for your attention to detail.
Jonathan