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.