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

Which setting turns on the diff3 conflict style permanently?

Which setting turns on the diff3 conflict style permanently?

  1. A.git config --global core.diff3 true
  2. B.git config --global merge.conflictStyle diff3
  3. C.git merge --diff3 always
  4. D.git config pull.rebase diff3
Answer & explanation

Correct answer: git config --global merge.conflictStyle diff3

diff3 adds the base version between ||||||| and =======.

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 →