← 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?
- A.The author's email
- B.The date of each commit
- C.The base version, after a ||||||| line
- 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 →