Abort a git cherry-pick?
I ran git cherry-pick <hash>
and had merge conflicts. I don't want to resolve the conflicts, I just want to abort the cherry-pick. When doing an actual merge (with git merge
) there's the handy git merge --abort
. What's the equivalent for cherry-picking?
You can do the following
git cherry-pick --abort
From the git cherry-pick
docs
--abort
Cancel the operation and return to the pre-sequence state.
I found the answer is git reset --merge
- it clears the conflicted cherry-pick attempt.
For me, the only way to reset the failed cherry-pick-attempt was
git reset --hard HEAD