Add `dolt_preview_merge_conflicts` table function#9270

Merged

tbantle22 merged 16 commits intomainfrom

taylor/conflicts-preview-table

Jun 10, 2025

Commits on May 29, 2025

Commits on May 30, 2025

More fixes
tbantle22
committed

Commits on Jun 3, 2025

Clean up
tbantle22
committed

Commits on Jun 4, 2025

Merge branch 'taylor/conflicts-preview' into taylor/conflicts-preview-table
tbantle22
committed

Commits on Jun 5, 2025

Commits on Jun 6, 2025

Better naming, Schema doc string
tbantle22
committed

Commits on Jun 10, 2025

Merge remote-tracking branch 'origin/main' into taylor/conflicts-preview-table
tbantle22
committed