-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
First pass at merges doc #661
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, what do you want to do about constraint violations?
set @@dolt_allow_commit_conflicts = 1; | ||
``` | ||
|
||
The server will not allow you to create new Dolt commits (with the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something that may be important to clarify is that the moment you sql transaction commit, commit conflicts into a working set, any other MySQL client has to set @@dolt_allow_commit_conflicts = 1
even if they aren't producing new conflicts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happens if they don't?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feel free to add this note yourself.
Co-authored-by: Dhruv Sringari <dhruvy427@gmail.com>
Co-authored-by: Dhruv Sringari <dhruvy427@gmail.com>
Fixes #632