docs $ dolt sql -q "select * from docs"
docs $ dolt branch make-conflicts
docs $ dolt sql -q "update docs set c1=10 where pk=1"
Rows matched: 1 Changed: 1 Warnings: 0
docs $ dolt sql -q "select * from docs"
docs $ dolt commit -m "Made pk=1, c1=10"
commit jjkqslpnbbvjh7efdhcsqdh68ekl0leb
Date: Mon Dec 06 16:40:12 -0800 2021
docs $ dolt checkout make-conflicts
Switched to branch 'make-conflicts'
docs $ dolt sql -q "select * from docs"
docs $ dolt sql -q "update docs set c1=0 where pk=1"
Rows matched: 1 Changed: 1 Warnings: 0
docs $ dolt sql -q "select * from docs"
docs $ dolt commit -m "Made pk=1, c1=0"
commit 5gmleh5ksmtsdeeaqeagpsitpug4ntoj
Date: Mon Dec 06 16:40:54 -0800 2021
docs $ dolt checkout main
Switched to branch 'main'
docs $ dolt merge make-conflicts
Updating jjkqslpnbbvjh7efdhcsqdh68ekl0leb..5gmleh5ksmtsdeeaqeagpsitpug4ntoj
CONFLICT (content): Merge conflict in docs
Automatic merge failed; fix conflicts and then commit the result.
docs $ dolt conflicts cat docs
+-----+--------+----+----+
+-----+--------+----+----+
+-----+--------+----+----+