Zach Musgrave

If you want to use auto commit for merges, you need to set a session variable that allows you to commit transactions with merge conflicts. By default this behavior is...

The fact that there are no rows in the dolt_conflicts table after the merge makes me think that the session variable was not actually set, and that the transaction actually...

Correction: we don't need to store the entire result set in memory -- it can just be a cursor that we pull rows off of as needed. https://dev.mysql.com/doc/internals/en/com-stmt-fetch.html

> > Just blow away and re-create create the new repo storage over and over until it matches the condition you want. > > Do you mean delete the repo...

MySQL supports the more lenient (undefined behavior) version, and we should too. It's tricky to get right though. For now, as you've discovered, Dolt behaves the same as MySQL when...

This is fixed in source. We'll close this when it's in a release.

HI @n0mn0m, can you clarify your expectations about what should happen when a branch is locked? * Presumably only the holder of the lock can create new commits on the...

Hi @pbowyer, I'm not sure what I was talking about in that comment, I must have been confused. I just verified that this feature request is not implemented yet. Auto...

I am not positive that we implement auto_increment_increment, but if not it's an easy addition The other workaround I would suggest is just seeding the key space for every table...

We've come around to the idea that Dolt auto_increment keys should be global on a database, and this is now the behavior on main. Merged in this PR: https://github.com/dolthub/dolt/pull/4071 If...