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

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.