'How to abort a 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 of cherry-picking?
Solution 1:[1]
I found the answer is git reset --merge - it clears the conflicted cherry-pick attempt.
Solution 2:[2]
For me, the only way to reset the failed cherry-pick-attempt was
git reset --hard HEAD
Solution 3:[3]
Try also with '--quit' option, which allows you to abort the current operation and further clear the sequencer state.
--quit Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert.
--abort Cancel the operation and return to the pre-sequence state.
use help to see the original doc with more details, $ git help cherry-pick
I would avoid 'git reset --hard HEAD' that is too harsh and you might ended up doing some manual work.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|---|
| Solution 1 | agmin |
| Solution 2 | Diego P. Steiner |
| Solution 3 |