Re: cherry-pick --no-commit does not work well with --continue in case of conflicts

From: Ilya Kantor <iliakan@gmail.com>
Date: May 6, 2018, 05:17 UTC
Message-ID: <CAFU8umjw-gz1UGHwiopHRJ-+v+KS2USqXV-9Qs0ieW8GaLpUsA@mail.gmail.com>
In-Reply-To: <xmqqd0y9sdei.fsf@gitster-ct.c.googlers.com>

Let's say master..feature has 2 commits: A and B.

Then `git cherry-pick -n master..feature` should pick-up A and then B into the working directory and the index.

If applying A leads to a conflict, then it stops on A, like here:

>>> git cherry-pick -n master..feature
>> error: could not apply 2c11f12... Run work

Then I add the fix to the index, and should be able to continue on (B is yet unpicked):

>>> git add .
>>> git cherry-pick --continue
>> error: your local changes would be overwritten by cherry-pick.
>> fatal: cherry-pick failed

Now it fails. Expected behavior: should continue with picking B.

P.S. I assume, `cherry-pick -n <commits>` is meant to merge given commits' changes into the current working directory and the index, without making new commits, for any given set of commits, hope that's right?

Then we should be able to --continue in case of a conflict without committing.