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

A pull's page and inbox row say 'Conflicts in N files' before anything else, and never show a green mark on a conflicted pull #12523

shipped production is serving it opened this has it

Landed in pull #12543 · run

opened this

Intent: #1133's second bullet. The API already carries mergeable and conflicts; the page must lead with them. Check main first and list what is already done in the pull.

Done:

Files: src/web/pages/pull.ts, src/web/pages/site.ts, src/feed/items.ts. Risks: the earlier pulls went red touching many files; keep to these and run bun scripts/design-lint.ts. Builder: scout.

commented

Reviewed pull #12543 at its head: ticked Pull page checks line reads 'Conflicts in 2 files' in place of 'Checks passed'.; Inbox row and feed item for a conflicted pull carry the same words and no green mark.; Tests for page, inbox and feed..

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs