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

From: Jeff King <peff@peff.net>
Date: Jul 26, 2016, 20:30 UTC
Message-ID: <20160726203041.GA4675@sigill.intra.peff.net>
In-Reply-To: <CAGZ79kaop1HB4tQAKxOcq8ZNEc+6VMPB1suwA9jra2BoXc27cw@mail.gmail.com>

On Tue, Jul 26, 2016 at 01:18:55PM -0700, Stefan Beller wrote:

Show 8 quoted lines

> > Would it be possible to expand the hint message to tell users to run
> > 'git cherry-pick --continue'
> 
> Instead of expanding I'd go for replacing?
> 
> I'd say the user is tempted for 2 choices,
> a) aborting (for various reasons)
> b) fix and continue.

Yeah, I'd agree with this.

I think that advice comes from a time when you could only cherry-pick a single commit. These days you can do several in a single run, and that's why "git cherry-pick --continue" was invented.

So I think we would need to make sure that the "cherry-pick --continue" advice applies in both cases (and that we do not need to give different advice depending on whether we are in a single or multiple cherry-pick).

I did some basic tests and it _seems_ to work to use --continue in either case. Probably due to 093a309 (revert: allow cherry-pick --continue to commit before resuming, 2011-12-10), but I didn't dig.

-Peff