Why cherry-pick is useful in Git - Visual Breakdown

Process Flow - Why cherry-pick is useful

Start on branch A

↓

Make commit X on branch A

↓

Switch to branch B

↓

Cherry-pick commit X onto branch B

↓

Commit X changes appear on branch B

↓

Branches A and B have commit X independently

Cherry-pick copies a specific commit from one branch to another without merging all changes, letting you pick only what you want.

Execution Sample

Git

git checkout branchA
# make commit X

git checkout branchB
git cherry-pick <commit-hash-of-X>

This copies commit X from branchA to branchB without merging all branchA changes.

Process Table

Step	Action	Branch	Commit History	Result
1	Start on branchA	branchA	A1 -> A2	Ready to make new commit
2	Make commit X	branchA	A1 -> A2 -> X	Commit X added to branchA
3	Switch to branchB	branchB	B1 -> B2	On branchB, no commit X yet
4	Cherry-pick commit X	branchB	B1 -> B2 -> X'	Commit X copied to branchB as X'
5	Check commit histories	branchA & branchB	branchA: A1 -> A2 -> X branchB: B1 -> B2 -> X'	Both branches have commit X independently

💡 Cherry-pick ends after commit X is copied to branchB without merging full branchA

Status Tracker

Variable	Start	After Step 2	After Step 4	Final
branchA commits	A1 -> A2	A1 -> A2 -> X	A1 -> A2 -> X	A1 -> A2 -> X
branchB commits	B1 -> B2	B1 -> B2	B1 -> B2 -> X'	B1 -> B2 -> X'

Key Moments - 2 Insights

Why does cherry-pick create a new commit X' instead of reusing X?

Cherry-pick copies the changes but creates a new commit with a different ID on the target branch, as shown in step 4 of the execution_table.

Does cherry-pick merge all changes from branchA to branchB?

No, cherry-pick only copies the selected commit (X) without merging the entire branch, as seen in step 4 where only commit X is added to branchB.

Visual Quiz - 3 Questions

Look at the execution_table at step 4, what happens to branchB's commit history?

A BranchB merges all commits from branchA

B Commit X is removed from branchB

C Commit X is added as a new commit X' on branchB

D BranchB stays unchanged

💡 Hint

Check the 'Commit History' column at step 4 in the execution_table

At which step does branchA get commit X?

A Step 2

B Step 1

C Step 3

D Step 4

💡 Hint

Look at the 'Commit History' for branchA after each step in the execution_table

If you cherry-pick multiple commits, how would the variable_tracker for branchB change?

A branchB commits would be reset to branchA commits

B branchB commits would include all cherry-picked commits in order

C branchB commits would only have the last cherry-picked commit

D branchB commits would not change

💡 Hint

Variable_tracker shows commits added step by step; multiple cherry-picks add commits sequentially

Concept Snapshot

git cherry-pick <commit>
Copies a single commit from another branch
Creates a new commit with same changes
Does not merge full branch history
Useful to pick specific fixes or features

Full Transcript

Cherry-pick lets you copy one commit from a branch to another without merging everything. You start on branchA and make a commit X. Then you switch to branchB and run cherry-pick with commit X's ID. This adds a new commit X' to branchB with the same changes. Both branches now have commit X independently. Cherry-pick creates a new commit ID because it applies the changes fresh on the target branch. It is useful when you want just one fix or feature from another branch without merging all its changes.

Practice

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