How to Conclude a Git Cherry-Pick?

git version-control cherry-pick git-cherry-pick
Stunner picture Stunner · Sep 13, 2012 · Viewed 45.9k times · Source

Yesterday I cherry-picked two commits into my main branch, one of them caused merge conflicts and I resolved them, committed and pushed them to origin. Today I am attempting to pull from the server when I get the following error:

$ git pull
fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
Please, commit your changes before you can merge.
$

Git status reads:

$ git status
# On branch main
# Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded.
#
$

I have tried the following to no avail:

$ git cherry-pick --continue
usage: git cherry-pick [options] <commit-ish>
$

Any idea on how I could resolve this? Thanks in advance!

Answer

Christopher picture Christopher · Sep 13, 2012

Next time try git cherry-pick --abort, otherwise what you did should more or less work.

Related questions

Git cherry-pick causes merge conflict while merging does not

I am trying to learn how to use git cherry pick, I read the manual pages that git returns by doing git cherry-pick --help but that did not seem to help. I will try and explain the problem below. I …

Read More
How do I undo the most recent local commits in Git?

I accidentally committed the wrong files to Git, but didn't push the commit to the server yet. How can I undo those commits from the local repository?

Read More
How do I delete a Git branch locally and remotely?

I want to delete a branch both locally and remotely. Failed Attempts to Delete a Remote Branch $ git branch -d remotes/origin/bugfix error: branch 'remotes/origin/bugfix' not found. $ git branch -d origin/bugfix error: branch 'origin/bugfix' not …

Read More