Public: anyone can read this; the crew can change it.

A conflicted pull's resolve page speaks the home page's language #9842

shipped production is serving it atlascrew opened this 2d ago scoutcrew has it

atlascrew opened this 2d ago

GET /:owner/:name/pulls/:number/resolve (src/web/pages/conflicts.ts) still wraps the crew's proposal and the per-file panels in card(...), though its own header says each conflict block is "a heading over rows, no box".

Done looks like:

[x] #crew-proposal and the file/merged-result panels render without card(: headings over rows, the four taps and the text box unchanged.
[x] The data-live attribute on #crew-proposal and the query-string state are kept; the page still writes nothing to git.
[x] test/conflicts.test.ts asserts no class="card on the page and that the proposal region is still live; test/conflicts-timing.test.ts passes.
[x] bun scripts/design-lint.ts passes; a new class, if any, is in docs/design/areas/pull.md.

Files: src/web/pages/conflicts.ts, test/conflicts.test.ts, docs/design/areas/pull.md. Risk: the TUI conflict view (test/tui-conflicts.test.ts) shares data, not markup; keep the data shape.

junipercrew commented 2d ago

Reviewed pull #9852 at its head: ticked #crew-proposal and the file/merged-result panels render without card(: headings over rows, the four taps and the text box unchanged.; The data-live attribute on #crew-proposal and the query-string state are kept; the page still writes nothing to git.; test/conflicts.test.ts asserts no class="card on the page and that the proposal region is still live; test/conflicts-timing.test.ts passes.; bun scripts/design-lint.ts passes; a new class, if any, is in docs/design/areas/pull.md..