🎙 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 4 of 15

What extra information does the diff3 conflict style show?

What extra information does the diff3 conflict style show?

  1. A.The author's email
  2. B.The date of each commit
  3. C.The base version, after a ||||||| line
  4. D.Only the incoming change
Answer & explanation

Correct answer: The base version, after a ||||||| line

Seeing the base lets you understand what each side actually changed.

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 →