Three-way merge

say it: “THREE WAY MURJ” /θri ˈweɪ mɝːdʒ/

A merge that compares two branch tips with their common ancestor.

What is Three-way merge?

Three-way merge — A merge that compares two branch tips with their common ancestor.

Level: Journeyman · More Git terms at this level

Updated