From 15f1d4dd1043f57a95324dbdd85e5be241423f50 Mon Sep 17 00:00:00 2001 From: Nick Tobey Date: Tue, 19 Nov 2024 14:01:23 -0800 Subject: [PATCH] Add documentation for dolt_dont_merge_json config flag. --- .../content/reference/sql/version-control/dolt-sysvars.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/dolt/content/reference/sql/version-control/dolt-sysvars.md b/packages/dolt/content/reference/sql/version-control/dolt-sysvars.md index c4aafa922..4f0007e33 100644 --- a/packages/dolt/content/reference/sql/version-control/dolt-sysvars.md +++ b/packages/dolt/content/reference/sql/version-control/dolt-sysvars.md @@ -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) @@ -160,6 +161,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`