← 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?
- A.That the remote is offline
- B.That no conflict markers remain and the code builds and its tests pass
- C.That you used --force
- 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 →