Why cherry-pick is useful in Git - See It in Action

Why cherry-pick is useful

📖 Scenario: You are working on a software project with multiple branches. Sometimes, you want to take a specific change from one branch and apply it to another without merging all changes. This is where git cherry-pick helps.

🎯 Goal: Learn how to use git cherry-pick to copy a single commit from one branch to another.

📋 What You'll Learn

Create a new branch called feature from main

Make a commit on feature with a specific message

Switch back to main branch

Use git cherry-pick to apply the commit from feature to main

Show the commit log on main to confirm the cherry-pick

💡 Why This Matters

🌍 Real World

Cherry-pick is useful when you want to apply a specific fix or feature from one branch to another without merging all changes. For example, applying a bug fix from a development branch to the stable release branch.

💼 Career

Understanding cherry-pick helps you manage code changes efficiently in team projects, especially when working with multiple branches and releases.

1

Create a new branch and make a commit

Create a new branch called feature from main and switch to it. Then create a file named feature.txt with the content New feature added and commit it with the message Add new feature.

Git

# Create and switch to feature branch
# Create feature.txt with content
# Commit with message 'Add new feature'
# Your code here

Hint

Use git checkout -b feature main to create and switch to the new branch.

Use echo to create the file and git commit -m to commit.

2

Switch back to main branch

Switch back to the main branch using the correct git checkout command.

Git

git checkout -b feature main
echo 'New feature added' > feature.txt
git add feature.txt
git commit -m 'Add new feature'
# Switch back to main branch
# Your code here

Hint

Use git checkout main to switch branches.

3

Cherry-pick the commit from feature branch

Use git cherry-pick with the commit hash from the feature branch to apply that commit to the main branch. First, find the commit hash by running git log feature -1 --pretty=format:%H. Then use git cherry-pick <commit-hash>.

Git

git checkout -b feature main
echo 'New feature added' > feature.txt
git add feature.txt
git commit -m 'Add new feature'
git checkout main
# Find commit hash from feature branch
# Cherry-pick that commit onto main
# Your code here

Hint

Use git log feature -1 --pretty=format:%H to get the latest commit hash from feature.

Then use git cherry-pick <commit-hash> to apply it.

4

Show the commit log on main branch

Run git log -1 --oneline on the main branch to display the latest commit message and confirm that the cherry-pick was successful.

Git

git checkout -b feature main
echo 'New feature added' > feature.txt
git add feature.txt
git commit -m 'Add new feature'
git checkout main
commit_hash=$(git log feature -1 --pretty=format:%H)
git cherry-pick $commit_hash
# Show the latest commit log on main
# Your code here

Hint

Use git log -1 --oneline to see the latest commit message.

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