Abort a git cherry-pick

Question

I ran git cherry-pick  lt hash gt  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

User · Answer

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

User · Answer

For me  the only way to reset the failed cherry-pick-attempt was  git reset --hard HEAD

User · Answer

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

User · Answer

I found the answer is git reset --merge - it clears the conflicted cherry-pick attempt

[git] Abort a git cherry-pick?

Examples related to git

Examples related to git-cherry-pick