FA-75662 / Text diff and three-way merge / Member archive

Three-way key-value merge: matching edits on both branches are a conflict · case 02

Both branches set the same new value and the merge still reports a conflict.

Member previewVariant 2 · 3 implementations · 10 checks per implementation

Case contract

Merge base, ours and theirs maps key by key over the union of keys; an absent key and a key holding null are different states. If ours and theirs agree, take that state; else if ours equals base take theirs; else if theirs equals base take ours; otherwise record a conflict and keep ours. Return sorted merged [key, value] pairs and sorted conflicting keys.

Why this case matters

Structured configuration and lock files are merged per key, where deletions and null values must stay distinguishable.

One recorded failure

Sample boundary fixture

This sample comes from the broken implementation of a controlled reproducer.

Boundary fixture	Actual	Expected	Outcome
both change a key the same way	`{"conflicts": ["mode"], "merged": [["host", "a"], ["mode", "y"], ["port", "80"]]}`	`{"conflicts": [], "merged": [["host", "a"], ["mode", "y"], ["port", "80"]]}`	Failed

MEMBER ARCHIVE

The complete case is available to members.

This record includes three runnable implementations, regression fixtures, execution results, and source hashes.

Member access is invitation-based. Sign in with your invited account to inspect the sources.