cherry-pick --no-commit does not work well with --continue in case of conflicts
From: Ilya Kantor <hidden>
Date: 2018-05-05 20:27:10
From: Ilya Kantor <hidden>
Date: 2018-05-05 20:27:10
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 cherry-pick --continue
error: your local changes would be overwritten by cherry-pick. fatal: cherry-pick failed It could continue *if* I committed, but I'm --no-commit for a reason, so I shouldn't have to commit to go on with cherry-pick. Maybe there's a preliminary check that prevents --continue and should be fixed? --- Best Regards, Ilya Kantor