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

Ilya Kantor writes: > P.S. I assume, `cherry-pick -n ` 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? Hmph. One step in cherry-pick should refuse to

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

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

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

Ilya Kantor writes: > Somewhy cherry-pick --no-commit does not work well with --continue. > > Let's say I'm copying changes w/o committing and get a conflict: > >> git cherry-pick -n master..feature > error: could not apply 2c11f12... Run work > > Then I fix the conflict, but

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

Somewhy cherry-pick --no-commit does not work well with --continue. Let's say I'm copying changes w/o committing and get a conflict: > git cherry-pick -n master..feature error: could not apply 2c11f12... Run work Then I fix the conflict, but cherry-pick refuses to go on: > git add . > git