branches

Summary

A branch is not a page of its own. Switch to it and Journey, Pages, Components and Styles show it, as Complete or Delta.

Raw wireframes

• .context/designs/web/northwind/northwind-web/new-checkout/<journey|pages|components|styles>/<complete|delta>.html
• .context/designs/web/northwind/northwind-web/new-checkout/verify.html and merge.html
• .context/designs/web/northwind/northwind-web/branches/new.html

Why it is drawn this way

• One way to look at a design, on main or on a branch. The address names the branch.
• Complete · Delta sits beside the branch picker. Complete is the whole product with what changed marked; Delta is only what changed (Journey keeps the changed page's neighbours, faded, for context).
• The bar on a branch holds its state: 1 conflict (opens the item it is on), Verify 96 and Merge. Merge stays off while a conflict is open.
• Commits are the History tab; a page or component lists its changes on this branch, with who made each and in which commit.
• A conflict shows on the item: both values drawn, Take main or Keep branch.
• Branches is not in the rail. The branch menu lists the open branches and opens New branch, a page with a name, where to start from, and whether to bring your draft.
• Values follow example-northwind.