🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← Quiz: Resolving Merge Conflicts: all 15 questions

Quiz: Resolving Merge Conflicts · Question 3 of 15

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

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

  1. A.The version from the branch you are on (ours)
  2. B.The version from the branch being merged in (theirs)
  3. C.The common ancestor
  4. D.A comment added by Git
Answer & explanation

Correct answer: The version from the branch you are on (ours)

HEAD is your current branch; the incoming branch's text comes after =======.

Can you get the rest right without peeking?

Take the timed Quiz: Resolving Merge Conflicts quiz free. Pass it to earn XP and count towards your certificate.

Start the quiz →