Cherry-picking multiple commits in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

Output of cherry-picking a range of commits

You run the command git cherry-pick A1B2C3..D4E5F6 where A1B2C3 and D4E5F6 are commit hashes. What is the result?

A Git applies all commits after A1B2C3 up to and including D4E5F6 onto the current branch.

B Git applies commits from A1B2C3 to D4E5F6 including A1B2C3 onto the current branch.

C Git applies only the commit A1B2C3 onto the current branch.

D Git applies commits from D4E5F6 to A1B2C3 in reverse order onto the current branch.

💡 Hint

Remember how git ranges work with two commit hashes separated by two dots.

The range A1B2C3..D4E5F6 means all commits after A1B2C3 up to and including D4E5F6. Git cherry-pick applies these commits in order onto the current branch.

🧠 Conceptual

intermediate

Understanding cherry-pick with multiple commits

Which statement correctly describes what happens when you cherry-pick multiple commits using git cherry-pick commit1 commit2 commit3?

A Git applies all commits simultaneously in parallel.

B Git applies only the last commit listed.

C Git applies the commits one by one in the order listed, stopping if a conflict occurs.

D Git applies the commits in reverse order from last to first.

💡 Hint

Think about how git handles conflicts during cherry-pick.

Git applies commits sequentially in the order given. If a conflict happens, it stops and asks for resolution before continuing.

❓ Troubleshoot

advanced

Resolving cherry-pick conflict scenario

You cherry-pick three commits but get a conflict on the second commit. What is the correct next step to continue cherry-picking the remaining commits?

A Resolve the conflict, stage the changes, then run <code>git cherry-pick --continue</code>.

B Abort the cherry-pick with <code>git cherry-pick --abort</code> and start over.

C Ignore the conflict and run <code>git cherry-pick --skip</code> to skip the second commit.

D Reset the branch to before cherry-pick and manually apply commits.

💡 Hint

How does git expect you to handle conflicts during cherry-pick?

When a conflict occurs, you must fix it, stage the resolved files, then continue cherry-picking with git cherry-pick --continue.

🔀 Workflow

advanced

Cherry-picking multiple commits with a script

You want to cherry-pick commits abc123, def456, and ghi789 in that order using a single command. Which command achieves this?

A git cherry-pick abc123,def456,ghi789

B git cherry-pick abc123..ghi789

C git cherry-pick abc123; git cherry-pick def456; git cherry-pick ghi789

D git cherry-pick abc123 def456 ghi789

💡 Hint

How does git accept multiple commits in one cherry-pick command?

You can list multiple commits separated by spaces in one cherry-pick command to apply them in order.

✅ Best Practice

expert

Best practice for cherry-picking multiple commits with dependencies

You need to cherry-pick three commits where the third depends on changes in the first two. What is the best practice to avoid conflicts and maintain history?

A Cherry-pick only the third commit since it includes all changes.

B Cherry-pick the commits in the original order one by one, resolving conflicts as they come.

C Squash all three commits into one and cherry-pick the single combined commit.

D Cherry-pick the commits in reverse order to apply dependencies first.

💡 Hint

Think about how dependencies between commits affect cherry-picking order.

Applying commits in their original order preserves dependencies and reduces conflicts. Skipping or reversing order can cause errors.