Re: [PATCH 5/7] [doc] git-cherry-pick: link to new merge conflicts guide

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 28, 2026, 21:25 UTC
Message-ID: <xmqqh5j9kr0y.fsf@gitster.g>
In-Reply-To: <cc1af300-d296-49c8-98ae-8b30ef11ada3@app.fastmail.com>

"Julia Evans" <julia@jvns.ca> writes:

Show 6 quoted lines

> My best guess (based on what you said) is that `CHERRY_PICK_HEAD` is
> only useful if you're cherry-picking multiple commits at the same time.
> Is the following an accurate explanation?:
>
>> If the conflict happened when cherry picking multiple commits, you can run
>> `git show CHERRY_PICK_HEAD` to see the commit that Git failed to apply.

You do not have to limit yourself to the multi-pick case. If you make it a habit to use CHERRY_PICK_HEAD, you do not have to remember exactly which commit you specified on the command line to pick when stopped by a conflict during a cherry-pick. This is especially true for those who have already made it a habit to use MERGE_HEAD when stopped by a conflict during a merge. Not having to think when you can mechanically perform a routine task is bliss.