What is "the three-way merge algorithm" and what role does the "merge base" (common ancestor) play in it?
Correct! Well done.
Incorrect.
The correct answer is A) A three-way merge compares three versions of a file — the common ancestor ("merge base") and the two divergent branch versions — to determine, per region, whether only one side changed it (auto-resolve) or both sides changed it differently (conflict)
Correct Answer
A three-way merge compares three versions of a file — the common ancestor ("merge base") and the two divergent branch versions — to determine, per region, whether only one side changed it (auto-resolve) or both sides changed it differently (conflict)
Without the merge base as a reference point, Git couldn't distinguish "branch A added this line" from "branch B deleted this line" — comparing against the common ancestor lets Git apply non-overlapping changes automatically and flag only truly conflicting overlaps.