git cherry-pick a single commit - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the git cherry-pick command do?

It applies the changes introduced by a specific commit from one branch onto the current branch.

beginner

How do you cherry-pick a single commit with hash abc123?

Use the command git cherry-pick abc123 while on the target branch.

intermediate

What should you do if a conflict occurs during git cherry-pick?

Manually resolve the conflicts, then run git cherry-pick --continue to finish.

intermediate

Can git cherry-pick be used to apply multiple commits at once?

Yes, by specifying a range of commits or multiple commit hashes, but for a single commit, just use its hash.

advanced

What happens if you cherry-pick a commit that is already in the current branch?

Git typically aborts because it would result in an empty commit (changes already present), unless --allow-empty is used to create a duplicate with a new hash, which can cause confusion.

What is the purpose of git cherry-pick?

A To apply a specific commit from another branch to the current branch

B To delete a commit from the history

C To merge two branches automatically

D To create a new branch

git cherry-pick copies changes from a specific commit to your current branch.

Which command applies commit abc123 to your current branch?

A git merge abc123

B git cherry-pick abc123

C git checkout abc123

D git revert abc123

git cherry-pick abc123 applies that commit's changes to your branch.

If a conflict happens during cherry-pick, what is the next step?

A Resolve conflicts manually then run <code>git cherry-pick --continue</code>

B Ignore and continue

C Abort the cherry-pick with <code>git cherry-pick --abort</code>

D Delete the branch

You must fix conflicts and then continue the cherry-pick process.

Can git cherry-pick create duplicate commits?

A No, it prevents duplicates

B Only on merge commits

C Yes, it creates a new commit with a new hash

D Only if you use <code>--force</code>

Cherry-pick creates a new commit with a new hash. If the changes already exist, it aborts (empty commit) unless --allow-empty is used.

Which command aborts a cherry-pick in progress?

A git revert

B git reset --hard

C git merge --abort

D git cherry-pick --abort

git cherry-pick --abort stops the cherry-pick and resets to the previous state.

Explain how to cherry-pick a single commit from another branch and what to do if conflicts occur.

Think about the steps from switching branches to finishing the cherry-pick.

Describe the risks or issues that can happen when cherry-picking commits.

Consider what happens if the same changes exist or conflicts arise.