* reimplement dolt_transaction_merge_stomp at merge layer
add idx
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* fix tests
* remove stomp conflicts
* conflict reader must be reset each time PartitionRows is called
* reimplement dolt conflict resolve --theirs|--ours through sql path
Also drops manual conflict resolving through cli
* add cardinality columns to dolt_conflicts_table_name for keyless tables
* Adds keyless conflict deleting for new format
* dolt conflicts resolve sql impl for keyless tables
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* delete cli.ParseKeyValues
* fix tests
* temporarily allow dolt_docs to be mutated from SQL path
Because conflicts resolve uses the SQL path, dolt_docs needs to be editable.
* fix untested code, comment out docs tests
* bats
* fix a couple found merge bugs
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* if statements...
* add comments
Co-authored-by: druvv <druvv@users.noreply.github.com>
* [no-release-notes] New format blob read/write
Use blob chunker to write blobs out of band. Tests for
round tripping and address walking at the tree level.
Run Blob enginetests and extra large file blob tests.
* NodeStore ref refactors
* fix index
* run verify
* fix more bats
* small PR cleanup
* more changes
* last bats errors
Maximilian Hoffman