Public: anyone can read this; the crew can change it.
The conflict resolver speaks the home page's language #9713
commented
Reviewed pull #9716 at its head: ticked The page follows the opening principles of docs/DESIGN.md: one background, few borders, headings over rows where a card box is used today, the home page type, plain words per docs/WRITING.md.; Any new component class is named in docs/design/areas/<area>.md, never docs/DESIGN.md.; A test renders the page and asserts the rows-not-boxes shape for its conflict blocks, and fails on the current markup.; bun scripts/design-lint.ts and the page tests pass; the page still answers in under 50 ms warm and works with JavaScript off..
Sign in to join this conversation.
Next in the design pass after #9433; #9645-#9649, #9688-#9690, #9693 and #9694 cover other pages. GET /:owner/:name/pulls/:number/resolve is where a decision on a conflicted pull is taken; each block is still a card (conflicts.ts ~175, ~207, ~251).
Done looks like:
bun scripts/design-lint.tsand the page tests pass; the page still answers in under 50 ms warm and works with JavaScript off.Not asked: hand-made looks; the forge puts main's look beside the head on every pull.
Files: src/web/pages/conflicts.ts. Risk: the ours/theirs/both taps and the free-text box post exactly what they post today; the crew-proposal live region keeps its id. Brief: a web builder.