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?