Going Beyond Three-Way Merge

Both sides changed val : ours to 'dog' and theirs to 'fish'. There's no way to tell which change should win, so this is a conflict , and a person must choose.

DoltHub Newsroom · 2026-10-27T00:00:00.000Z