Skills101
← All practice quizzes

Quiz: Resolving Merge Conflicts

5 questions · new set on every retakeNo time limitPass: 60%+10 XP on first pass

Why merge conflicts happen, how Git decides with a three-way merge, how to read conflict markers (including the diff3 style), resolve them safely, abort, and handle conflicts during a rebase.

Log in to take the quiz

Free account · see your score, answers and explanations, earn XP

  1. Question 1

    What are the three versions Git compares in a three-way merge?

  2. Question 2

    Base has x = 1. Ours still has x = 1. Theirs has x = 2. What does the merge produce?

  3. Question 3

    In the conflict markers, the text between <<<<<<< HEAD and ======= is:

  4. Question 4

    What extra information does the diff3 conflict style show?

  5. Question 5

    After editing a conflicted file into its final form during a merge, what tells Git it is resolved?

🎯 Today’s placement challenge — 10 questions, no login. Can you score 10/10?Take today’s challenge →