Skip to content

Allow for three way merges to automatically resolve concurrent changes to a JSON object when the changes affect different keys. #7230

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

Merged
nicktobey merged 24 commits into from
Jan 8, 2024

Add tests for `dont_merge_json`, both as a command line flag and as a…

56a32f6
Select commit
Loading
Failed to load commit list.
Merged

Allow for three way merges to automatically resolve concurrent changes to a JSON object when the changes affect different keys. #7230

Add tests for `dont_merge_json`, both as a command line flag and as a…
56a32f6
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs