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