git cherry-pick — Applying Specific Commits

Picking Only the Commits You Want

git cherry-pick applies one or more commits from another branch onto your current branch — without merging the entire branch:

git cherry-pick abc1234           # apply one commit
git cherry-pick abc1234 def5678  # apply two commits
git cherry-pick main~2..main     # apply last 2 commits from main

Common use cases

• A critical bug was fixed on a feature branch — apply it to main immediately
• You committed something to the wrong branch — cherry-pick it to the right one, then revert from the wrong one
• Selectively backport fixes to older release branches

# If conflicts arise:
git cherry-pick --continue   # after resolving
git cherry-pick --abort      # cancel

Your Task

The hotfix branch has a bug fix commit. Cherry-pick just that commit onto main.