Bird
Raised Fist0
Gitdevops~5 mins

Why cherry-pick is useful in Git - Why It Works

Choose your learning style10 modes available
LearnWhyDeepVisualTryChallengeProjectRecallTime

Start learning this pattern below

Jump into concepts and practice - no test required

or
Recommended
Test this pattern10 questions across easy, medium, and hard to know if this pattern is strong
Introduction
Sometimes you want to take a specific change from one branch and add it to another without merging everything. Cherry-pick lets you copy just that one change easily.
When you fixed a bug in a feature branch and want to apply the fix to the main branch without merging all feature changes
When you want to add a small improvement from one branch to another without bringing unrelated commits
When you accidentally committed a change to the wrong branch and want to move it to the correct branch
When you want to test a specific commit from another branch in your current branch
When you want to share a single commit with a teammate without sharing the whole branch
Commands
Switch to the main branch where you want to apply the specific change.
Terminal
git checkout main
Expected OutputExpected
No output (command runs silently)
Copy the commit with ID 3a1b2c4 from another branch and apply it to the current branch.
Terminal
git cherry-pick 3a1b2c4
Expected OutputExpected
[main 9f8e7d6] Fix typo in README Author: Jane Doe <jane@example.com> Date: Thu Apr 25 10:00:00 2024 +0000 README typo fixed
Check the latest commit on the current branch to confirm the cherry-pick was successful.
Terminal
git log --oneline -1
Expected OutputExpected
9f8e7d6 Fix typo in README
Key Concept

If you remember nothing else from this pattern, remember: cherry-pick lets you copy a single commit from one branch to another without merging all changes.

Common Mistakes
Trying to cherry-pick a commit that causes conflicts without resolving them
The cherry-pick will stop and not complete until conflicts are fixed, leaving the branch in a conflicted state
Manually fix the conflicts shown, then run 'git cherry-pick --continue' to finish
Cherry-picking commits that depend on previous commits not included
The cherry-picked commit may not work correctly if it relies on earlier changes missing in the target branch
Also cherry-pick the dependent commits or merge the branches instead
Cherry-picking commits without checking out the correct target branch first
The commit will be applied to the wrong branch, causing confusion and possible errors
Always switch to the branch where you want the commit before running cherry-pick
Summary
Use 'git checkout' to switch to the branch where you want to apply a specific commit.
Run 'git cherry-pick <commit-id>' to copy that commit to your current branch.
Verify the commit was added with 'git log --oneline -1'.

Practice

(1/5)
1. What is the main purpose of the git cherry-pick command?
easy
A. To merge two branches completely
B. To create a new branch from a commit
C. To delete a branch safely
D. To copy specific commits from one branch to another

Solution

  1. Step 1: Understand cherry-pick function

    git cherry-pick copies individual commits, not whole branches.

  2. Step 2: Compare with other commands

    Merging combines all changes; cherry-pick selects specific commits only.

  3. Final Answer:

    To copy specific commits from one branch to another -> Option D

  4. Quick Check:

    Cherry-pick = copy commits [OK]
Hint: Cherry-pick copies commits, merge combines branches [OK]
Common Mistakes:
  • Confusing cherry-pick with merge
  • Thinking cherry-pick deletes branches
  • Assuming cherry-pick creates new branches
2. Which of the following is the correct syntax to cherry-pick a commit with hash abc123?
easy
A. git pick abc123
B. git cherry-pick abc123
C. git cherry abc123
D. git commit cherry abc123

Solution

  1. Step 1: Recall cherry-pick syntax

    The correct command is git cherry-pick <commit-hash>.

  2. Step 2: Check options for syntax errors

    The incorrect options use invalid git commands or wrong order such as 'git pick', 'git cherry', or 'git commit cherry'.

  3. Final Answer:

    git cherry-pick abc123 -> Option B

  4. Quick Check:

    Correct syntax = git cherry-pick [OK]
Hint: Use full command: git cherry-pick commit_hash [OK]
Common Mistakes:
  • Using 'git cherry' instead of 'git cherry-pick'
  • Omitting 'pick' keyword
  • Mixing cherry-pick with commit command
3. Given the following scenario:
git log --oneline on branch feature shows:
1a2b3c Fix typo in README
4d5e6f Add new login feature

You run git checkout main and then git cherry-pick 4d5e6f.
What will happen on the main branch?
medium
A. No commits are copied, cherry-pick fails
B. Both commits are copied to main
C. Only the 'Add new login feature' commit is copied to main
D. The entire feature branch is merged into main

Solution

  1. Step 1: Identify the commit cherry-picked

    The command cherry-picks commit 4d5e6f which is 'Add new login feature'.

  2. Step 2: Understand cherry-pick effect on main

    Only the specified commit is copied; other commits remain unchanged.

  3. Final Answer:

    Only the 'Add new login feature' commit is copied to main -> Option C

  4. Quick Check:

    Cherry-pick copies single commit [OK]
Hint: Cherry-pick copies one commit by hash [OK]
Common Mistakes:
  • Assuming all commits from feature branch copy
  • Thinking cherry-pick merges branches
  • Believing cherry-pick fails without conflicts
4. You tried to cherry-pick a commit but got a conflict error. What is the best way to fix this?
medium
A. Manually resolve the conflict, then run git cherry-pick --continue
B. Abort the cherry-pick with git cherry-pick --abort and try again
C. Delete the branch and recreate it
D. Run git merge --abort to fix cherry-pick conflicts

Solution

  1. Step 1: Understand cherry-pick conflict handling

    When conflicts occur, you must manually fix them in files.

  2. Step 2: Continue cherry-pick after resolving conflicts

    After fixing, run git cherry-pick --continue to finish the process.

  3. Final Answer:

    Manually resolve the conflict, then run git cherry-pick --continue -> Option A

  4. Quick Check:

    Fix conflicts + cherry-pick continue [OK]
Hint: Fix conflicts manually, then git cherry-pick --continue [OK]
Common Mistakes:
  • Using git merge commands to fix cherry-pick conflicts
  • Aborting without trying to resolve conflicts
  • Deleting branches unnecessarily
5. You have a bug fix commit on branch hotfix that you want to apply to both main and develop branches without merging all changes from hotfix. What is the best approach?
hard
A. Use git cherry-pick to copy the bug fix commit to both branches
B. Merge hotfix into main and develop
C. Rebase hotfix onto main and develop
D. Create a patch file and apply it manually

Solution

  1. Step 1: Identify the need to apply a single commit selectively

    You want only the bug fix commit, not all changes from hotfix.

  2. Step 2: Choose cherry-pick for selective commit copying

    git cherry-pick copies specific commits to multiple branches without merging entire branches.

  3. Final Answer:

    Use git cherry-pick to copy the bug fix commit to both branches -> Option A

  4. Quick Check:

    Cherry-pick = selective commit copy [OK]
Hint: Cherry-pick copies single commits to multiple branches easily [OK]
Common Mistakes:
  • Merging whole branches causing unwanted changes
  • Using rebase which rewrites history
  • Manually patching which is error-prone