Conflict Resolver

Preview in your theme

7 fields compared · only the 2 that both sides touched are asked about; the other 5 merge silently and stay auditable under the disclosure. Long text gets word-level marks, the tag array gets per-item marks.

Resolve conflicts2 conflicts

You and Dana Ruiz both saved this draft while it was open.

7 fields compared · 5 merged automatically

0 of 2 conflicts resolved · 2 still undecided

Fill all:

summarymeta description
tags

Bulk fill then per-field override — every decided field keeps a “bulk” / “manual” tag, so it is obvious which ones were considered one at a time.

Pricing plan changed under you4 conflicts

Press “Keep all yours”, then change one field back — the tags show which choices came from the bulk fill and which you overrode.

5 fields compared · 1 merged automatically

0 of 4 conflicts resolved · 4 still undecided

Fill all:

priceUSD / seat / month
seatsIncluded
displayName
limits

Zero conflicts: 3 fields merged automatically, 2 untouched, nothing to ask. defaultShowAutoMerged opens the audit list here.

Campaign updated elsewhere0 conflicts

Two people edited the same record and none of the edits overlap.

5 fields compared · 5 merged automatically

No decisions needed — every field merged cleanly.

nameUntouched
Weekly digest
sendOnOnly you changed it
tuesday
sendAtOnly they changed it
07:30
segmentsSame edit on both sides
productchangelogbeta
recipientsUntouched
250

Delete versus edit, plus a save that rejects: the message lands in a role=alert and both choices stay exactly where they were.

Merge, then fail1 conflict

Delete-versus-edit is still just a conflict: “not set” is one of the three candidates.

2 fields compared · 1 merged automatically

0 of 1 conflict resolved · 1 still undecided

Fill all:

descriptionyou cleared it, they rewrote it

Loading preview…

This component is part of Pro

The install command, prompt and concept map are included with a Pro license — one purchase unlocks every Pro component, forever.

Unlock with Pro