DOLT_MERGE should return detailed error

[liuqianhong6007]

The CLI dolt merge works well as shown

However, SELECT DOLT_MERGE('feature1', '-no-ff', '-m', 'Merge branch feature1 into main') does't work. The repo main branch is not clean

It indicetes that I should use dolt commit to conclude merge.
I think maybe variable @@autocommit affects, so I print the value which has been set default true

Then I notice that it returns "1" that indicates something wrong. But I get no result by quering dolt_conflicts_$db table
So where can I get the detail error ?

[VinaiRachakonda]

This is confusing on our part. dolt_merge returning 1 means there are no conflicts. I'm going to clean up the return syntax and appropriately update the documentation

[timsehn]

The error messages and workflow have been updated in many recent releases. This should work better now.