mirror of
https://github.com/dolthub/dolt.git
synced 2026-01-23 03:00:00 -06:00
8b00e78e64
* add bats test to check that merges can succeed in a conflicted state fix tests * add skipped bats for merges that violate check constraints post-merge * add types.UnionMaps * caller can choose value when key collision occurs * fix comment * allow merges when conflicts or violations are committed * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * skip bats on new format * enginetest -> queries * last bats fix * more bats * missing run in bats * pr edits Co-authored-by: druvv <druvv@users.noreply.github.com>