THE FOLD / CO-OP / THE MERGE / THE MERGE
THE MERGE
two branches become one
3-way merge: BASE, two branches edit it. non-conflicting edits auto-merge; a line both sides change differently is a CONFLICT.
MERGED:
clean — · conflicts —
LIT A genuine 3-way line merge, the algorithm behind git merge. For each line it compares OURS and THEIRS to the BASE: if only one side changed, take that side; if both made the same change, take it; if both changed it differently, it's a CONFLICT (marked <<< ours | theirs >>>). Here two edits auto-merge and one line (log ok vs log fail) genuinely conflicts. Counts live in window.__merge.
FIG The two-player CO-OP framing is the story; the base-vs-ours-vs-theirs resolution is the real merge every team relies on.
FIG The two-player CO-OP framing is the story; the base-vs-ours-vs-theirs resolution is the real merge every team relies on.
◆ sealed .dlw.fold → folded to ROOT_0 · a sphere of THE MERGE · David Lee Wise (ROOT0), with AVAN