Dhruv Sringari 06947de821 [no-release-notes] merge sets of conflicts together (#3586) ...

* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

* merge sets of conflicts together, update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* pr comments

* skip cv test

Co-authored-by: druvv <druvv@users.noreply.github.com>

2022-06-13 14:37:23 -07:00

..

cmd

Simplified types, removed some type checks, fixed SELECT output

2022-06-11 19:06:41 -07:00

gen

[no-release-notes] store conflicts in unified merge artifacts table (#3579)

2022-06-09 13:07:47 -07:00

Godeps

[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

2022-06-04 07:42:23 +00:00

libraries

[no-release-notes] merge sets of conflicts together (#3586)

2022-06-13 14:37:23 -07:00

performance

make local_benchmark port configurable

2022-06-04 17:28:36 -07:00

serial

[no-release-notes] store conflicts in unified merge artifacts table (#3579)

2022-06-09 13:07:47 -07:00

store

[no-release-notes] store conflicts in unified merge artifacts table (#3579)

2022-06-09 13:07:47 -07:00

utils

Fix error message for DOLT_MERGE conflicts (#3413)

2022-05-17 19:56:09 -04:00

.gitignore

…

go.mod

Simplified types, removed some type checks, fixed SELECT output

2022-06-11 19:06:41 -07:00

go.sum

Simplified types, removed some type checks, fixed SELECT output

2022-06-11 19:06:41 -07:00