You cherry-pick a commit that modifies a file already changed on your branch, causing conflicts. After resolving conflicts, which command finalizes the cherry-pick?

hard📝 Application Q9 of 15

Git - Cherry-Pick and Advanced Merging

Agit cherry-pick --finish

Bgit commit -m 'resolved conflicts'

Cgit merge --continue

Dgit cherry-pick --continue

Step-by-Step Solution

Solution:

Step 1: Identify the command to continue cherry-pick after conflicts
After resolving conflicts, run git cherry-pick --continue to complete the process.
Step 2: Differentiate from other commands
git commit alone won't finalize cherry-pick; git merge --continue is for merges, not cherry-pick.
Final Answer:
git cherry-pick --continue -> Option D
Quick Check:
Finish cherry-pick after conflicts = git cherry-pick --continue [OK]

Quick Trick: Use 'git cherry-pick --continue' after resolving conflicts [OK]

Common Mistakes:

Using git commit instead of cherry-pick continue
Confusing with merge commands
Not finalizing cherry-pick after conflict resolution

Master "Cherry-Pick and Advanced Merging" in Git

9 interactive learning modes - each teaches the same concept differently

Learn Why Deep Visual Try Challenge Project Recall Time

Want More Practice?

15+ quiz questions · All difficulty levels · Free

Free Signup - Practice All Questions

More Git Quizzes

You cherry-pick a commit that modifies a file already changed on your branch, causing conflicts. After resolving conflicts, which command finalizes the cherry-pick?

Step 1: Identify the command to continue cherry-pick after conflicts

Step 2: Differentiate from other commands

Final Answer:

Quick Check:

Want More Practice?