🎙 Free live masterclass · Sun, 29 Nov, 7:00 pm IST · Java Full Stack roadmap Register free →
Skills101
← All topics

Quiz: Resolving Merge Conflicts: questions with answers

15 questions, each with the answer and a short explanation.

Take the timed quiz + get a certificate →
  1. Q1. What are the three versions Git compares in a three-way merge?
  2. Q2. Base has x = 1. Ours still has x = 1. Theirs has x = 2. What does the merge produce?
  3. Q3. In the conflict markers, the text between <<<<<<< HEAD and ======= is:
  4. Q4. What extra information does the diff3 conflict style show?
  5. Q5. After editing a conflicted file into its final form during a merge, what tells Git it is resolved?
  6. Q6. You started a merge, saw 40 conflicts and want to go back to exactly how things were before. Which command?
  7. Q7. During a rebase you fixed a conflict and ran git add. What do you run next?
  8. Q8. During a rebase onto main, what does "theirs" refer to?
  9. Q9. Which habit most reduces merge conflicts in a team?
  10. Q10. package-lock.json has a conflict after a merge. What is the usual safe approach?
  11. Q11. Base has price = 499. Both branches changed it to price = 549. What happens?
  12. Q12. Which setting turns on the diff3 conflict style permanently?
  13. Q13. During a merge conflict you decide to keep the incoming branch's version of config.json. What do you run?
  14. Q14. Which command lists the commits on both sides that touched the conflicted files?
  15. Q15. Before committing a resolved merge, what should you always check?