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

Before committing a resolved merge, what should you always check?

Before committing a resolved merge, what should you always check?

  1. A.That the remote is offline
  2. B.That no conflict markers remain and the code builds and its tests pass
  3. C.That you used --force
  4. D.That every file was taken from ours
Answer & explanation

Correct answer: That no conflict markers remain and the code builds and its tests pass

A file with leftover markers or a broken mix of both versions is a common, embarrassing mistake.

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 →