conflict

Surfacecanonicalverified 2026-10-04

SURFACE.WEB.DELTAS.CONFLICT

Summary

Two deltas touching the same primitive, shown side by side to resolve.

Raw wireframe

.context/designs/web/deltas/conflict.html

Why it is drawn this way

Converted, not redrawn. The prototype rendered this page at runtime from JSON. This is that render for the Norrland tenant, on branch 7-add-recs-empty-state, made static on 2026-10-04. See converted-design-set.

converted-design-set
flag-shapes

Sources

.context/designs/web/deltas/conflict.html