Git · Senior · Question 8 of 76
What does a three-way merge compare?
- 1Each commit of both branches in order
- ✓Correct answer: Both branch tips against their merge base
- 3The two branch tips line by line only
Explanation
If only one side changed a region relative to the base, its version wins; if both changed it differently, it's a conflict. Without the base Git couldn't tell additions from deletions.