Cherry-Picking - Quiz

Apply a specific commit from another branch onto the branch you currently have checked out

Start a cherry-pick sequence that stops before creating a commit so you can edit the changes

Abort an in-progress cherry-pick that produced conflicts you no longer want to resolve

Skip the current conflicting commit in an ongoing cherry-pick sequence and continue with the next one

Why might a team prefer cherry-picking a bugfix from a feature branch onto main instead of merging the whole branch?

What happens to the commit hash when you cherry-pick a commit onto another branch?

During git cherry-pick, what triggers a conflict that you must resolve manually?

Which syntax correctly cherry-picks a continuous range of commits from C through F (inclusive)?

When resolving a cherry-pick conflict, what should you do after editing the conflicted files and staging them?

Order the steps to cherry-pick a single bugfix commit from feature into main and finalize it.

Drag and drop to reorder, or use the arrows.

Order the steps to cherry-pick a range of commits from a feature branch onto release.

Drag and drop to reorder, or use the arrows.

Order the steps to recover from a failed cherry-pick you decide not to keep.

Drag and drop to reorder, or use the arrows.

Order the steps for resolving a conflict during a multi-commit cherry-pick sequence.

Drag and drop to reorder, or use the arrows.

You are on branch main. What single line of output will this command produce?

1git branch --show-current

You successfully cherry-picked one commit with hash 12ab3cd. What exact output line will Git print at the end?

1git cherry-pick 12ab3cd

You are in the middle of a cherry-pick sequence with conflicts. What line will this command show?

1git status --short --branch | head -n 1

You run a cherry-pick that causes a conflict. Immediately after, what single line does Git print to indicate the problem?

1git cherry-pick 3c4d5e6 || echo "conflict"

Find the incorrect command in this cherry-pick workflow for applying a bugfix from feature-login onto main.

Click on the line(s) that contain the bug.

git checkout main

git pull origin main

git cherry-pick feature-login

git push origin main

Identify the incorrect command in this attempt to resolve a cherry-pick conflict.

Click on the line(s) that contain the bug.

git cherry-pick a1b2c3d

# edit conflicted files

git add .

git cherry-pick --abort

git cherry-pick --continue

Spot the incorrect command in this attempt to cherry-pick a range of commits.

Click on the line(s) that contain the bug.

git checkout release

git log feature

git cherry-pick C..F

git push origin release

Match each cherry-pick-related command with its description.

Click an item on the left, then click its match on the right. Click a matched item to unmatch.

Match each cherry-pick conflict marker or command to its meaning.

Click an item on the left, then click its match on the right. Click a matched item to unmatch.

Match each cherry-picking scenario to the most appropriate Git action.

Click an item on the left, then click its match on the right. Click a matched item to unmatch.

Complete the commands to resolve a cherry-pick conflict and finish applying the commit.

Complete the commands to cherry-pick a single bugfix from feature into main.

Complete the commands to cherry-pick a range of commits from a feature branch onto a release branch.

Click the line that shows the commit currently being cherry-picked.

Click on the line to select.

On branch main

You are currently cherry-picking commit 3a4b5c6.

  (fix conflicts and run "git cherry-pick --continue")

  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Click the line that indicates Git is in the middle of a cherry-pick operation.

Click on the line to select.

On branch main

Your branch is ahead of 'origin/main' by 1 commit.

  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9f8e7d6.

Click the line that shows there are unmerged paths due to a cherry-pick conflict.

Click on the line to select.

On branch feature

You are currently cherry-picking commit 1a2b3c4.

Unmerged paths:

  (use "git add <file>..." to mark resolution)