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

Which command lists the commits on both sides that touched the conflicted files?

Which command lists the commits on both sides that touched the conflicted files?

  1. A.git status
  2. B.git blame
  3. C.git log --merge
  4. D.git describe
Answer & explanation

Correct answer: git log --merge

It helps you understand why each side changed the lines.

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 →