JSON three-way merge

Client

Resolve concurrent JSON edits.

Learn more: JSON three-way merge

Merge base, ours, and theirs JSON values to inspect non-overlapping edits and surface conflicting changes in structured configuration or test fixtures.

Required input

Use the page example to provide base, ours, and theirs. Changes made on only one side can be carried forward; edits to the same path need careful review.

What the result means

Three-way JSON merge cannot infer human intent. Arrays, delete-versus-edit cases, and incompatible type changes may require manual conflict resolution after reviewing the output.

Local processing

The page parses and transforms the pasted document in your browser. Use a smaller representative sample first when the source is large.

What this page does

Merge base, ours, and theirs JSON values to inspect non-overlapping edits and surface conflicting changes in structured configuration or test fixtures.

Input and workflow

Use the page example to provide base, ours, and theirs. Changes made on only one side can be carried forward; edits to the same path need careful review. Start with Load example or prefill the primary input with ?q= / ?qb=.

Scope and limits

Three-way JSON merge cannot infer human intent. Arrays, delete-versus-edit cases, and incompatible type changes may require manual conflict resolution after reviewing the output.

The operation runs in your browser. Large documents may slow the tab, so test a representative sample before processing more data.

Loading…

Nearby workflows on Toolcore

Common use cases

  • Reconcile two edited versions of a JSON config against a shared base.
  • Prototype merge behavior for structured documents before applying changes in source control.
  • Inspect whether concurrent fixture edits touch the same JSON paths.

Common mistakes to avoid

  • Using the wrong common base

    A three-way merge depends on the actual shared ancestor. An unrelated base creates misleading changes.

  • Assuming arrays merge by identity

    Array behavior is structural and may replace or conflict; review ordered lists carefully.

  • Accepting output without conflict review

    A syntactically valid result can still choose the wrong business meaning when both sides edit the same field.

FAQ

What are base, ours, and theirs?

Base is the shared ancestor; ours and theirs are the two independently edited versions.

Does this modify source files?

No. It only processes the pasted JSON values.

Is merging performed locally?

Yes. The documents stay in your browser.

Common search terms

Phrases people search for that match this tool. See the full long-tail keyword index.

  • json three way merge
  • merge base ours theirs json
  • json merge conflict tool

More tools

Related utilities you can open in another tab—mostly client-side.