Cherry-picking multiple commits in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

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

Git

git cherry-pick [1]

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

Amerge

Bcommit

Cbranch

Dabc1234

Attempts:

3 left

💡 Hint

Common Mistakes

Using a branch name instead of a commit hash.

Typing 'merge' instead of 'cherry-pick'.

The command git cherry-pick abc1234 applies the changes from the commit with hash abc1234 onto your current branch.

2fill in blank

medium

Complete the command to cherry-pick a range of commits from abc1234 to def5678.

Git

git cherry-pick [1]

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

Aabc1234..def5678

Babc1234-def5678

Cabc1234:def5678

Dabc1234,def5678

Attempts:

3 left

💡 Hint

Common Mistakes

Using a dash or colon instead of two dots.

Separating commits with a comma.

The syntax abc1234..def5678 specifies a range of commits from abc1234 (exclusive) up to def5678 (inclusive) for cherry-picking.

3fill in blank

hard

Fix the error in the command to cherry-pick multiple commits listed individually.

Git

git cherry-pick [1]

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

Aabc1234 def5678 ghi9012

Babc1234,def5678,ghi9012

Cabc1234;def5678;ghi9012

Dabc1234-def5678-ghi9012

Attempts:

3 left

💡 Hint

Common Mistakes

Using commas or semicolons to separate commit hashes.

Using dashes instead of spaces.

To cherry-pick multiple commits individually, list their hashes separated by spaces without commas or other separators.

4fill in blank

hard

Fill both blanks to cherry-pick commits from abc1234 to def5678 and continue cherry-picking even if conflicts occur.

Git

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

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

Aabc1234..def5678

Bcontinue

Cabort

Dskip

Attempts:

3 left

💡 Hint

Common Mistakes

Using --abort which cancels the cherry-pick.

Using --skip which skips the current commit.

git cherry-pick abc1234..def5678 starts applying the range of commits. Use git cherry-pick --continue after resolving conflicts to proceed with the remaining commits.

5fill in blank

hard

Fill all three blanks to cherry-pick commits abc1234, def5678 individually and abort if conflicts occur.

Git

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

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

Aabc1234

Bdef5678

Cghi9012

Dabort

Attempts:

3 left

💡 Hint

Common Mistakes

Using ghi9012 as a commit hash in the last blank instead of an option.

Using continue instead of abort.

This command cherry-picks commits abc1234 and def5678 and then aborts the cherry-pick process if there is a conflict.

Practice

1. What does the git cherry-pick command do when used with multiple commit hashes?

easy

A. It applies the changes from each specified commit onto the current branch.

B. It merges the entire branch containing those commits into the current branch.

C. It deletes the specified commits from the current branch.

D. It creates a new branch with the specified commits only.

Solution

1. Step 1: Understand cherry-pick purpose

   The git cherry-pick command copies changes from specific commits to the current branch without merging the whole branch.

2. Step 2: Effect of multiple commits

   When multiple commit hashes are listed, git applies each commit's changes one by one onto the current branch.

3. Final Answer:

   It applies the changes from each specified commit onto the current branch. -> Option A

4. Quick Check:

   Cherry-pick = copy specific commits [OK]

Hint: Cherry-pick copies commits, it does NOT merge branches [OK]

Common Mistakes:

• Confusing cherry-pick with merge
• Thinking it deletes commits
• Assuming it creates a new branch

2. Which of the following is the correct syntax to cherry-pick multiple commits with hashes a1b2c3 and d4e5f6?

easy

A. git cherry-pick --all a1b2c3 d4e5f6

B. git cherry-pick a1b2c3,d4e5f6

C. git cherry-pick -m a1b2c3 d4e5f6

D. git cherry-pick a1b2c3 d4e5f6

Solution

1. Step 1: Review cherry-pick syntax

   The correct way to cherry-pick multiple commits is to list their hashes separated by spaces, not commas or flags.

2. Step 2: Analyze options

   git cherry-pick a1b2c3 d4e5f6 uses spaces between commit hashes without extra flags, which is the correct syntax.

3. Final Answer:

   git cherry-pick a1b2c3 d4e5f6 -> Option D

4. Quick Check:

   Multiple commits separated by spaces [OK]

Hint: Separate commit hashes by spaces, not commas [OK]

Common Mistakes:

• Using commas between commit hashes
• Adding unnecessary flags
• Using incorrect options like --all

3. Given the following commands run on branch feature:

git checkout feature
git cherry-pick 123abc 456def

What will happen if both commits apply cleanly?

medium

A. Only the first commit 123abc will be applied, the second will be ignored.

B. The changes from commits 123abc and 456def will be added to the feature branch in order.

C. Git will merge the branches containing those commits into feature.

D. An error will occur because multiple commits cannot be cherry-picked at once.

Solution

1. Step 1: Understand cherry-pick with multiple commits

   When multiple commits are cherry-picked, git applies each commit sequentially if no conflicts occur.

2. Step 2: Effect on current branch

   Since the branch is feature, the changes from both commits will be added in the order listed.

3. Final Answer:

   The changes from commits 123abc and 456def will be added to the feature branch in order. -> Option B

4. Quick Check:

   Multiple commits apply sequentially [OK]

Hint: Cherry-pick applies commits one by one in order [OK]

Common Mistakes:

• Assuming only first commit applies
• Confusing cherry-pick with merge
• Thinking multiple commits cause errors

4. You run git cherry-pick abc123 def456 but get a conflict on the second commit. What should you do to continue cherry-picking the remaining commits?

medium

A. Fix the conflict, then run git cherry-pick --continue to proceed.

B. Abort the cherry-pick with git cherry-pick --abort and start over.

C. Run git reset --hard to discard changes and continue.

D. Use git cherry-pick --skip immediately without fixing conflicts.

Solution

1. Step 1: Handle conflicts during cherry-pick

   When a conflict occurs, you must manually fix it before continuing.

2. Step 2: Continue cherry-pick process

   After fixing conflicts, running git cherry-pick --continue resumes applying remaining commits.

3. Final Answer:

   Fix the conflict, then run git cherry-pick --continue to proceed. -> Option A

4. Quick Check:

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

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

Common Mistakes:

• Skipping conflicts without fixing
• Aborting instead of continuing
• Resetting hard loses work

5. You want to cherry-pick commits 111aaa, 222bbb, and 333ccc from branch dev onto main. However, 222bbb depends on changes in 111aaa, but 333ccc is unrelated. Which command correctly cherry-picks only the dependent commits in order?

hard

A. git checkout main && git cherry-pick 333ccc 111aaa 222bbb

B. git checkout main && git cherry-pick 222bbb 111aaa

C. git checkout main && git cherry-pick 111aaa 222bbb

D. git checkout main && git cherry-pick 111aaa,222bbb

Solution

1. Step 1: Identify dependent commits

   Since 222bbb depends on 111aaa, both must be cherry-picked in order to avoid errors.

2. Step 2: Choose correct command syntax and order

   git checkout main && git cherry-pick 111aaa 222bbb checks out main and cherry-picks commits in the correct order separated by spaces.

3. Final Answer:

   git checkout main && git cherry-pick 111aaa 222bbb -> Option C

4. Quick Check:

   Dependent commits cherry-picked in order [OK]

Hint: Cherry-pick dependent commits in order, skip unrelated [OK]

Common Mistakes:

• Cherry-picking commits in wrong order
• Including unrelated commits unnecessarily
• Using commas instead of spaces