error: cannot cherry-pick during a revert

Hi,

This just happened to me while cherry-pick'ing:

$ git cherry-pick HEAD@{1} error: could not apply 614fe5e629b84... try hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' Recorded preimage for 'taskcluster/ci/build/linux.yml'

(... this is where I fix my conflict ...)

$ git add -u $ git cherry-pick --continue error: cannot cherry-pick during a revert. fatal: cherry-pick failed

So apparently, cherry-pick thinks it was doing a revert when it hit a conflict?

(This is with git 2.23)

Mike