Does cherry-pick move the commit?

No, cherry-pick copies the commit. The original commit stays on its source branch. A new commit is created on the target branch with the same content but a different hash.

Can I cherry-pick multiple commits?

Yes, just list the hashes: git cherry-pick hash1 hash2 hash3. For a range of commits: git cherry-pick hash1..hash3 (excludes hash1) or git cherry-pick hash1^..hash3 (includes hash1).

What should I do if there is a conflict during cherry-pick?

Just like a merge: resolve the conflicts in the files, run git add on the resolved files, then git cherry-pick --continue. To abort: git cherry-pick --abort.

What is the difference between cherry-pick and merge?

merge integrates an entire branch (all its commits). cherry-pick only takes one or a few specific commits. Merge is for integrating complete work, cherry-pick is for picking specific pieces.

When should I NOT use cherry-pick?

Avoid cherry-pick when you want to integrate all work from a branch (use merge or rebase). Also avoid cherry-picking the same commit into multiple branches without reason, as it creates duplicate commits in history.

Git cherry-pick: apply a specific commit

Want to grab a single commit from another branch without merging everything? git cherry-pick lets you copy a specific commit to exactly where you need it.

Practice cherry-pick Git Glossary

gitquest — enquête

When to use cherry-pick?

Urgency

Production hotfix

A critical fix is on a dev branch. You need to apply it immediately to main/production without taking the rest of the work in progress.

Selection

Pick a specific commit

A branch contains several commits but you only want one particular change. Cherry-pick lets you choose.

Backport

Port to an older version

A fix made on the latest version also needs to be applied to an older maintenance version.

Cherry-pick in practice

Apply a commit and handle conflicts.

Simple cherry-pick

gitquest — cherry-pick

# Find the commit to cherry-pick

$git log --oneline feature/hotfix

a1b2c3d fix: critical payment fix

f4e5d6c feat: form redesign

b7c8d9e style: new button design

# Apply only the fix to main

$git checkout main

$git cherry-pick a1b2c3d

[main c3d4e5f] fix: critical payment fix

1 file changed, 3 insertions(+), 1 deletion(-)

With conflict

gitquest — cherry-pick conflict

# Cherry-pick with conflict

$git cherry-pick f4e5d6c

CONFLICT (content): Merge conflict in checkout.js

error: could not apply cherry-pick

# Resolve the conflict in the file, then:

$git add checkout.js

$git cherry-pick --continue

[main d4e5f6g] feat: form redesign

# Or abort the cherry-pick:

# git cherry-pick --abort

Best practices

Prefer merge or rebase when possible

Cherry-pick creates duplicate commits. If you want to integrate all work from a branch, merge is more appropriate.

Keep track of the original commit

In the cherry-pick message, Git adds a reference to the original commit. Keep this info for traceability.

Test after cherry-picking

A commit that works in its original context may not work in a different context. Always test after cherry-picking.

Part of the Git Branching Workflow guide

Related commands

git merge

Merge an entire branch

git rebase

Reorganize history

git log

Find the commit to cherry-pick

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about git cherry-pick

Practice cherry-pick in GitQuest

GitQuest investigations include situations where you need to apply specific commits.

Start practicing now