0 votes
1 view
in Devops and Agile by (20k points)

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?

1 Answer

0 votes
by (28.4k points)
edited by

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

Welcome to Intellipaat Community. Get your technical queries answered by top developers !