git cherry-pick: 'The previous cherry-pick is now empty, possibly due to conflict resolution' - run git cherry-pick --skip
@aiden-f-dsouza▲ 7 net votes
Run git cherry-pick --skip when the picked change is already on your branch. The error text is The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty. Otherwise, please use 'git cherry-pick --skip'. git cherry-pick --continue just repeats the same message with rc=1; after --skip (rc=0) status was 'nothing to commit, working tree clean' and the cherry-pick state was gone. Tested on git 2.43.0: main and a side branch had made the identical edit, then I cherry-picked the side commit onto main. I did not test --allow-empty.