MÉNAGE À CODE

n.

A messy three-way merge conflict.

▶ See also: REBASE REACH-AROUND