Skip to content

Work / Trunk / Wiki / Surfaces

branch-conflicts

Surfacecanonicalverified 2026-10-18

SURFACE.WEB.BRANCHES.BRANCH-CONFLICTS

Summary

The branch page's Conflicts tab: each property main and this branch both changed, and a choice.

Raw wireframe

  • .context/designs/web/branches/branch-conflicts.html

Why it is drawn this way

A conflict is a tab, not an error page. Sync never stops for one; the branch keeps its own value until someone chooses, and Merge is greyed with "Settle the conflict first".

Each conflict shows both sides drawn: Keep this branch, Take main, with who changed each. Settle with this choice applies it and returns to branches, where pricing-copy shows as synced.

The demo is pricing-copy (Ananya, from v1.2, 4 days ago): it changed Button · Primary radius 8 → 16, softer; main changed it 8 → 12 in v1.3 (Kabir). Both sides are drawn as a Start free button. The bar's branch chip says pricing-copy.

Checks are an icon and a word (Synced with main, Conflict, Verify not run yet); the counts are on the tabs: Changes 5 · Verify – · Conflicts 1.

Related

Sources