How to fix error: there is a cherry-pick in progress in Git

First, understand what's happening with the in-progress cherry-pick:

git status

This will show you:
- Which commit is being cherry-picked
- Whether there are unresolved conflicts
- What files are in conflict or staged

You can also see the commit being cherry-picked:

git log -1 CHERRY_PICK_HEAD

If you want to complete the cherry-pick and you've already resolved any conflicts:

1. Stage your resolved files:

git add <resolved-files>
# Or stage all:
git add .

2. Continue the cherry-pick:

git cherry-pick --continue

Git will create the commit and proceed to the next commit in the sequence (if any).

If you want to skip the problematic commit and continue with the remaining commits in a multi-commit cherry-pick:

git cherry-pick --skip

This skips the current commit and moves to the next one. Useful when:
- The commit results in an empty change (already applied)
- You've decided this particular commit isn't needed
- The conflicts are too complex to resolve

Note: This option was added in Git 2.23 (August 2019).

If you want to cancel the cherry-pick and return to your original state before it started:

git cherry-pick --abort

This will:
- Remove all cherry-pick sequencer state
- Restore your working directory to its pre-cherry-pick state
- Undo any partial commits made during the cherry-pick sequence

This is the safest option if you're unsure what to do.

If you want to stop the cherry-pick but keep the commits that were successfully applied:

git cherry-pick --quit

This is different from --abort:
- --abort undoes everything and returns to the original state
- --quit stops the operation but keeps successful commits

Use --quit when you've successfully cherry-picked some commits and want to keep them, but don't want to continue with the remaining ones.

Sometimes after resolving conflicts, the cherry-pick results in no changes (the commit was already applied or conflicts resolved to match existing code). Git will show:

The previous cherry-pick is now empty, possibly due to conflict resolution.

You have two options:

1. Skip this empty commit:

git cherry-pick --skip

2. Or commit it anyway as an empty commit:

git commit --allow-empty

In most cases, skipping is the right choice.

If the above commands don't work, you can manually remove the sequencer state files:

# Remove the cherry-pick head reference
rm -f .git/CHERRY_PICK_HEAD

# Remove the sequencer directory
rm -rf .git/sequencer

Warning: Only do this if the standard commands fail. This forcefully clears the state without properly cleaning up, which could leave your repository in an unexpected state.

After manual cleanup, run:

git status
git reset --hard HEAD  # Only if needed to clean working directory