Re: [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD

Hi,

Jay Soffian wrote:

On Thu, Feb 17, 2011 at 3:01 PM, Junio C Hamano [off-list ref] wrote:

quoted

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