confusing error message when selecting from conflict tables with @@autocommit = true

[liuqianhong6007]

When I merge feature branch, some conflicts occurs. Then I can use select * from dolt_conflicts_mycolor to get the conflicts just as the following

Next the problem appears.
I use SELECT DOLT_MERGE('test2') to merge feature branch and an error of conflicts is expected. Then select * from dolt_conflicts_mycolor should get the same output as above. But this time followed by an unexpected error of merge has unresolved conflicts. please use the dolt_conflicts table to resolve

And in golang test, I also get the error when I try to find out the conflicts

If this is not a bug, hava any idea to advance my work ?

[zachmu]

Hi @liuqianhong6007,

The reason you're seeing the error when you query the conflicts table is that @@autocommit is true (this is the default), so your client is trying to commit outstanding changes after every statement.

Use set @@autocommit = 0 instead.

We'll get a better error message for the client that mentions autocommit, this is confusing right now.

[liuqianhong6007]

Hi @liuqianhong6007,

The reason you're seeing the error when you query the conflicts table is that @@autocommit is true (this is the default), so your client is trying to commit outstanding changes after every statement.

Use set @@autocommit = 0 instead.

We'll get a better error message for the client that mentions autocommit, this is confusing right now.

It works. But I think it is more appropriate that DOLT_MERGER throws an error that determines whether I should check conficts table, and while selecting conflict table it returns only conflicts without any error

[timsehn]

This error message is fixed in recent releases.