Remove ConflictStrategy, FieldStrategy types and all associated config validation, getters, and tests. The 3-way merge engine was superseded by Dolt-native cell-level merge. Also adds DOLT_ROOT_HOST=% to test containers for Docker port-forwarding compatibility. Co-Authored-By: Rudy Alvarez <rudygt@gmail.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Executed-By: beads/crew/emma Rig: beads Role: crew
192 B
192 B
Attribution and Credits
The 3-way merge engine (internal/merge/) was removed during the Dolt-native migration.
Merge conflicts are now handled natively by Dolt's cell-level merge engine.