Compare, combine and resolve conflicts

Two-version comparison

Select exact Before and After snapshots, possibly from different alternatives using Set from timeline. Compare only after both are selected. The direction matters: Swap reverses additions/removals and invalidates old attribution. Expand an equipment group to inspect changed properties and native units. Missing is not zero. Inspect exact values pages large profiles by stored JSON pointer; absent and explicit null are different.

Three-way combination

Open Combine, choose the exact common Base, current/left and incoming/right versions. Pin from timelines when sources are in different alternatives. Optionally select exact incoming changes using the explicit selection control. Preparing a combination computes a three-version proposal, not an accepted merge. No base or conflict resolution is inferred from a row being highlighted.

Resolve every property

For each conflicting device/property choose Base, Current or Incoming deliberately. Nothing is selected by default. Related scalar and time-profile conflicts both need a choice. Use Next unresolved to navigate; inspect the selected source summaries and exact values before choosing. Large summaries do not push the choice offscreen. A profile choice retains its whole exact source; it does not average, normalize or interpolate values.

Finish or cancel

Prepare resolved proposal becomes available only when all required choices exist. The result is a separate alternative with recorded ancestry and evidence. Cancel leaves source versions unchanged. Inspect differences and run required studies before requesting a human review for Main. A prepared proposal is not an approval; imports and repeated retries do not transfer consent.