What is a "three-way" merge?

A merge that involves the two branch tips and their

common ancestor to determine how to combine changes, potentially creating a new

merge commit.

Long Answers: