git cherry-pick a single commit - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to cherry-pick a commit by its hash.

Git

git cherry-pick [1]

Drag options to blanks, or click blank then click option'

AHEAD

Bbranch

Ccommit

D<commit-hash>

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of the actual commit hash.

Using 'branch' which is for branches, not commits.

Using 'HEAD' which refers to the latest commit on the current branch.

You need to provide the commit hash to cherry-pick that specific commit.

2fill in blank

medium

Complete the command to cherry-pick a commit and continue after a conflict.

Git

git cherry-pick [1]

Drag options to blanks, or click blank then click option'

A--continue

B<commit-hash>

C--abort

D--skip

Attempts:

3 left

💡 Hint

Common Mistakes

Using --continue directly with cherry-pick without a commit hash.

Using --abort or --skip instead of the commit hash.

You must specify the commit hash to cherry-pick. Options like --continue are used after conflicts occur.

3fill in blank

hard

Fix the error in the cherry-pick command to apply a commit.

Git

git cherry-pick [1]

Drag options to blanks, or click blank then click option'

A<commit-hash>

Borigin

CHEAD~1

Dbranch-name

Attempts:

3 left

💡 Hint

Common Mistakes

Using a branch name instead of a commit hash.

Using remote names like 'origin' which are invalid here.

Cherry-pick requires a commit hash, not a branch name or remote name.

4fill in blank

hard

Fill both blanks to cherry-pick a commit and resolve conflicts by continuing.

Git

git cherry-pick [1] && git cherry-pick [2]

Drag options to blanks, or click blank then click option'

A<commit-hash>

B--continue

C--abort

DHEAD

Attempts:

3 left

💡 Hint

Common Mistakes

Using --abort instead of --continue to finish cherry-pick.

Using HEAD instead of the commit hash for cherry-pick.

First, you cherry-pick the commit by its hash. If conflicts occur, you resolve them and then run 'git cherry-pick --continue' to finish.

5fill in blank

hard

Fill all three blanks to cherry-pick a commit, resolve conflicts, and skip a commit.

Git

git cherry-pick [1] && git cherry-pick [2] && git cherry-pick [3]

Drag options to blanks, or click blank then click option'

A<commit-hash>

B--continue

C--skip

D--abort

Attempts:

3 left

💡 Hint

Common Mistakes

Using --abort instead of --skip to skip commits.

Not specifying the commit hash in the first command.

First, cherry-pick the commit by hash. After resolving conflicts, use --continue to proceed. If you want to skip a problematic commit, use --skip.

Practice

1. What does the git cherry-pick command do?

easy

A. Creates a new branch from the current commit

B. Deletes a commit from the current branch

C. Merges two branches completely

D. Copies a specific commit from another branch to the current branch

Solution

1. Step 1: Understand the purpose of git cherry-pick

   The command is used to copy a single commit from one branch to another without merging all changes.

2. Step 2: Compare with other git commands

   Unlike merge, cherry-pick applies only one commit, not the entire branch history.

3. Final Answer:

   Copies a specific commit from another branch to the current branch -> Option D

4. Quick Check:

   git cherry-pick = copy single commit [OK]

Hint: Cherry-pick copies one commit, not whole branch [OK]

Common Mistakes:

• Confusing cherry-pick with merge
• Thinking it deletes commits
• Assuming it creates branches

2. Which of the following is the correct syntax to cherry-pick a commit with hash abc123?

easy

A. git cherry-pick abc123

B. git cherry-pick -m abc123

C. git cherry-pick --commit abc123

D. git cherry-pick commit abc123

Solution

1. Step 1: Recall the basic cherry-pick syntax

   The command is git cherry-pick <commit-hash> to apply a single commit.

2. Step 2: Check the options given

   Only git cherry-pick abc123 matches the correct syntax without extra or incorrect flags.

3. Final Answer:

   git cherry-pick abc123 -> Option A

4. Quick Check:

   Correct syntax = git cherry-pick commit_hash [OK]

Hint: Use git cherry-pick followed by commit hash [OK]

Common Mistakes:

• Adding unnecessary flags
• Using incorrect keywords like 'commit'
• Confusing with merge options

3. Given the following commands run on branch main:

git checkout main
git cherry-pick 1a2b3c4

What will happen after these commands?

medium

A. The commit with hash 1a2b3c4 is applied to main branch

B. A new branch named 1a2b3c4 is created

C. The main branch is reset to commit 1a2b3c4

D. The commit 1a2b3c4 is deleted from the repository

Solution

1. Step 1: Understand the effect of git cherry-pick

   Running git cherry-pick 1a2b3c4 applies that commit's changes onto the current branch, here main.

2. Step 2: Analyze other options

   No new branch is created, no reset happens, and commits are not deleted by cherry-pick.

3. Final Answer:

   The commit with hash 1a2b3c4 is applied to main branch -> Option A

4. Quick Check:

   Cherry-pick applies commit to current branch [OK]

Hint: Cherry-pick applies commit changes to current branch [OK]

Common Mistakes:

• Thinking it creates branches
• Confusing cherry-pick with reset
• Assuming it deletes commits

4. You run git cherry-pick abcdef but get a conflict error. What should you do next?

medium

A. Abort the cherry-pick with git cherry-pick --abort and try again

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

C. Delete the conflicting files and commit

D. Run git reset --hard to fix the conflict

Solution

1. Step 1: Understand conflict during cherry-pick

   Conflicts mean git cannot automatically apply changes; manual resolution is needed.

2. Step 2: Resolve conflicts and continue

   After fixing conflicts in files, run git cherry-pick --continue to finish applying the commit.

3. Final Answer:

   Manually resolve the conflicts, then run git cherry-pick --continue -> Option B

4. Quick Check:

   Resolve conflicts + git cherry-pick --continue [OK]

Hint: Fix conflicts, then run git cherry-pick --continue [OK]

Common Mistakes:

• Aborting without trying to fix
• Deleting files instead of resolving
• Using reset which discards changes

5. You want to apply a commit from branch feature to main without merging all changes. The commit hash is f1e2d3c. Which sequence of commands correctly does this?

hard

A. git checkout main
git merge f1e2d3c

B. git checkout feature
git cherry-pick f1e2d3c
git checkout main

C. git checkout main
git cherry-pick f1e2d3c

D. git checkout main
git rebase feature

Solution

1. Step 1: Switch to the target branch

   You must be on main to apply the commit there.

2. Step 2: Cherry-pick the specific commit

   Run git cherry-pick f1e2d3c to copy that commit from feature branch.

3. Step 3: Analyze other options

   Switching to feature, cherry-picking there, then switching back to main does not apply the commit to main, as cherry-pick affects the current branch. Merge and rebase apply entire branches, not a single commit.

4. Final Answer:

   git checkout main git cherry-pick f1e2d3c -> Option C

5. Quick Check:

   Checkout target branch + cherry-pick commit [OK]

Hint: Checkout target branch first, then cherry-pick commit [OK]

Common Mistakes:

• Cherry-picking on wrong branch
• Using merge or rebase instead of cherry-pick
• Not switching branches before cherry-pick