Back
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?
Since you're saying that you don't want to resolve the conflicts, you just want to abort the cherry-pick.
This command should do the magic
$ git cherry-pick --abort
31k questions
32.8k answers
501 comments
693 users