Abort a git cherry-pick?
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?
3 Solutions collect form web for “Abort a git cherry-pick?”
You can do the following
git cherry-pick --abort
git cherry-pick docs
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