Hi,
Jay Soffian wrote:
> On Thu, Feb 17, 2011 at 3:01 PM, Junio C Hamano <gitster@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html