From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 03 Apr 2012 21:12:19 GMT
Subject: Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed
Message-ID: <20120403211219.GC19858@burratino>
In-Reply-To: <20120403210815.GB19858@burratino>

Jonathan Nieder wrote:
> Andrew Wong wrote:

>> Besides the "empty commit" failure, "cherry-pick" can still run into
>> various errors, such as merge conflict.
>
> Cherry-pick does the merge, so it is what notices the merge conflict.
> If you search for CHERRY_PICK_HELP in builtin/revert.c, the relevant
> code should show up.

I was looking at an older git version.  In newer gits, the code path
in question lives at print_advice() in sequencer.c.

Sorry for the noise.
Jonathan