Skip to content
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.

Sign up for GitHub

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

publish #2403

Merged
merged 2 commits into from
Nov 19, 2024
Merged

publish #2403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f1d4d
Add documentation for dolt_dont_merge_json config flag.
nicktobey Nov 19, 2024
e7a5462
Merge pull request #2402 from dolthub/nicktobey/systemvars
nicktobey Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/dolt/content/reference/sql/version-control/dolt-sysvars.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ title: Dolt System Variables

- [dbname_default_branch](#dbname_default_branch)
- [dolt_allow_commit_conflicts](#dolt_allow_commit_conflicts)
- [dolt_dont_merge_json](#dolt_dont_merge_json)
- [dolt_force_transaction_commit](#dolt_force_transaction_commit)
- [dolt_log_level](#dolt_log_level)
- [dolt_override_schema](#dolt_override_schema)
Expand Down Expand Up @@ -157,6 +158,10 @@ When set to `1`, this system variable ignores all merge conflicts,
constraint violations, and other correctness issues resulting from a
merge and allows them to be committed. Defaults to `0`.

## `dolt_dont_merge_json`

When set to `1`, Dolt will not attempt to automatically merge concurrent changes to the same JSON document, and will instead report the merge as having conflicts which must manually be resolved. Use this if your JSON requires invariants that could be violated if two commits make concurrent changes to different locations in the same document. Defaults to `0`.

# Replication variables

## `dolt_replicate_to_remote`
Expand Down
Loading