How to fix error: could not apply abc1234... commit message CONFLICT (content): Merge conflict in <file> in Git

First, see which files have conflicts that need resolution:

git status

Look for files listed under "Unmerged paths" with the status "both modified":

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   src/utils.js
        both modified:   config.yml

These are the files you need to fix manually.

Open each conflicting file in your editor. Git inserts conflict markers showing both versions:

<<<<<<< HEAD
// Your current branch's version
const result = processData(input);
=======
// The cherry-picked commit's version
const result = transformData(input);
>>>>>>> abc1234 (commit message)

The section between <<<<<<< HEAD and ======= is your current branch's code. The section between ======= and >>>>>>> is from the commit being cherry-picked.

Decide which code to keep, combine both changes, or write something entirely new. Remove all conflict markers when done:

// After resolution - keep one version, combine both, or write new code
const result = transformData(input); // chose the cherry-picked version

For complex conflicts, consider using a visual merge tool:

# Use your configured merge tool
git mergetool

# Or configure one first
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

After resolving conflicts in each file, stage them to mark them as resolved:

# Stage individual files
git add src/utils.js
git add config.yml

# Or stage all resolved files at once
git add .

Verify all conflicts are resolved:

git status

You should no longer see any files under "Unmerged paths".

Once all conflicts are resolved and staged, complete the cherry-pick:

git cherry-pick --continue

Git will open your editor to confirm or modify the commit message. Save and close to finish. The cherry-picked commit is now applied to your branch.

For bulk cherry-picks where you know you want one side's changes, use merge strategies:

# Keep the cherry-picked commit's changes on conflict
git cherry-pick --strategy=recursive -X theirs <commit>

# Keep your branch's changes on conflict
git cherry-pick --strategy=recursive -X ours <commit>

Warning: These options resolve ALL conflicts one way. Only use when you're certain you don't need to manually inspect each conflict.

If you need to abandon the cherry-pick and return to your previous state:

git cherry-pick --abort

This completely undoes the cherry-pick attempt, discarding any conflict resolutions you made. Your branch returns to exactly how it was before you started.

You can also skip just this one commit if cherry-picking multiple:

git cherry-pick --skip

Enable Git's "reuse recorded resolution" feature to remember how you resolved conflicts:

# Enable rerere globally
git config --global rerere.enabled true

Once enabled, if you encounter the same conflict again in the future, Git will automatically apply your previous resolution. This is especially useful when you frequently cherry-pick between long-lived branches.