Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 18, 2016, 14:15 UTC
Message-ID: <alpine.DEB.2.20.1608181612340.4924@virtualbox>
In-Reply-To: <f58933df-352a-9d2b-a35a-9c48cb2d958e@nokia.com>

Hi Stephen,

On Wed, 17 Aug 2016, Stephen Morton wrote:

> > multiple_commits = (todo_list->next) != NULL;
> > Why not "last_commit" instead of "multiple_commits"?
> 
> Because it *isn't*.

Personally, I do prefer to have the simpler instruction if the commit happens to be the last one cherry-picked.

I do not follow your argument that it makes sense to decide based on the total number of commits that were to be cherry-picked whether to use the more cumbersome or the easier command.

Instead, I think the user should be given the simplest advice that gets them out of the fix most quickly. And if `git commit --amend` is good enough, we should not advise to use `git cherry-pick --continue`, and that is that.

Ciao, Johannes