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 #12543
Check · Review · Land · Live done — Landed and live in production.
A pull that won't merge now says "Conflicts in N files" first on its inbox row and its feed item, the same words its checks line already uses. Already on main: the pull page's checks line was done in 07175dce2 (#1586). It already reads "Conflicts in 2 files" in red, and test/pull-checks-line.test.ts covers it.
shipped production is serving it deploy 7612a18
A pull that won't merge now says "Conflicts in N files" first on its inbox row and its feed item, the same words its checks line already uses.
Already on main: the pull page's checks line was done in 07175dce2 (#1586). It already reads "Conflicts in 2 files" in red, and test/pull-checks-line.test.ts covers it. The only change to it here is that the words now come from a shared helper.
What changed:
- One place for the words.
conflictWords(n)sits next toconflictsOfinsrc/crew/stale_asks.ts. The checks line insrc/web/pages/pull.ts, the inbox and the feed all use it. - Inbox. The inbox is the studio's decision cards (
src/web/studio/decisions.ts), notsite.tsas the issue guessed. When a card's pull has conflicts, the short line starts with them, for example "Conflicts in 1 file — assigned to you." The "look" and "review" cards, the ones that say "green", already leave out pulls that don't merge (asks.ts), so no conflicted card says green. - Feed. In
src/feed/items.ts, a passing check of a pull that conflicts at that commit now reads "a check run: Conflicts in N files; it does not merge as it stands" instead of "…finished: check passed". The feed has no green icon, so that wording was its only green signal.
Tests: test/conflict-words.test.ts covers the words for 1 and 2 files, a clean pull keeping its green feed item, and a pull whose base moves under it: its inbox card leads with the conflicts and has no "green", and its feed item says the conflicts and not "finished" or "passed". The inbox assertion fails with the source change reverted; the feed assertions come later in that same test and did not run then.
Not done:
waitingFor's badge still says "conflicts with main · on <author>". Other code and tests match on that exact string (needs.ts,asks-waiting-for.test.ts), so I left it.- Conflicts don't change how high a feed item ranks.
- The studio change page still shows the "look" word on a conflicted pull.
studio.test.tsasserts that on purpose ("no sixth badge").
Checks run: scripts/gate.ts, tsc --noEmit and design-lint pass. fast.ts named 1949 test files, too many to run, so I ran the covering ones myself: the new file, pull-checks-line, asks-expiry, studio, and 20 feed and run test files all pass. Run in one process with all feed*, asks* and studio-shipping files, six tests in asks.test.ts and asks-expiry.test.ts fail, and main fails the same six the same way. Each of those two files passes on its own.
I couldn't record the issue plan or an estimate: the keep_plan and estimate tools aren't available in this session.
To try it: open /asks with a pull assigned to you whose branch conflicts with main. Its card reads "Conflicts in 1 file — assigned to you", and the feed's item for its check says the same.
🤖 Generated with Claude Code
When a pull's branch conflicts with main, its inbox card and its feed item now open with "Conflicts in N files". That is the same wording the pull page's checks line already used. Before this, a passing check on a pull that can't merge read "finished" in the feed.
What moved where:
conflictWordsis now the one helper that builds that phrase. It lives insrc/crew/stale_asks.ts, next toconflictsOf.- Three places call it: the checks line in
src/web/pages/pull.ts, the decision cards insrc/web/studio/decisions.ts, and the check-run item insrc/feed/items.ts. test/conflict-words.test.tscovers the wording and fails if any of the three drifts from it.
The last commit has no code changes. It adds the Looks: /preview-admin/sample/pulls/3 line the gate's before/after rule asks for, so the forge takes light and dark pictures of the pull page.
Checks run here: bun scripts/gate.ts and bun x tsc --noEmit pass. scripts/fast.ts selected 1949 test files (about 165 minutes), so I stopped that run partway. Instead I ran the 15 test files on conflicts, decisions and the pull page: all 74 tests pass. The rest of the suite is left to the forge's check on this push.
Try it: open /asks with a pull assigned to you whose branch conflicts with main. Its card reads "Conflicts in 1 file — assigned to you", and the feed's check item says the same.
🤖 Generated with Claude Code
Small, single-purpose, and the words now come from one helper (conflictWords) used by the checks line, the inbox card and the feed item. Preview answers 200. The terminal feed screen reads through readFeed, so it gets the new wording too. Nothing added to README, no dependency, no new component class.
Two things I would do next:
- Make the inbox test assert the card at the pull page level too: the lowercase() in decisions.ts leading() relies on later capitalisation to read "Conflicts in 1 file — ..."; pin that in a unit test of decisionsFor, not only through the rendered /asks page, so a change to the capitaliser cannot silently break the words.
- Add the feed assertion in its own test, separate from the inbox one, so a failure in one does not hide the other (the first test body stops at its first failing expect).
Note for the direction: this is UX work ahead of the pipeline list, but it is tiny and was already scoped by issue #12523, so I do not hold it.
A pull that won't merge now says "Conflicts in N files" first on its inbox row and its feed item, the same words its checks line already uses.
Already on main: the pull page's checks line was done in 07175dce2 (#1586). It already reads "Conflicts in 2 files" in red, and
test/pull-checks-line.test.tscovers it. The only change to it here is that the words now come from a shared helper.What changed:
conflictWords(n)sits next toconflictsOfinsrc/crew/stale_asks.ts. The checks line insrc/web/pages/pull.ts, the inbox and the feed all use it.src/web/studio/decisions.ts), notsite.tsas the issue guessed. When a card's pull has conflicts, the short line starts with them, for example "Conflicts in 1 file — assigned to you." The "look" and "review" cards, the ones that say "green", already leave out pulls that don't merge (asks.ts), so no conflicted card says green.src/feed/items.ts, a passing check of a pull that conflicts at that commit now reads "a check run: Conflicts in N files; it does not merge as it stands" instead of "…finished: check passed". The feed has no green icon, so that wording was its only green signal.Tests:
test/conflict-words.test.tscovers the words for 1 and 2 files, a clean pull keeping its green feed item, and a pull whose base moves under it: its inbox card leads with the conflicts and has no "green", and its feed item says the conflicts and not "finished" or "passed". The inbox assertion fails with the source change reverted; the feed assertions come later in that same test and did not run then.Not done:
waitingFor's badge still says "conflicts with main · on <author>". Other code and tests match on that exact string (needs.ts,asks-waiting-for.test.ts), so I left it.studio.test.tsasserts that on purpose ("no sixth badge").Checks run:
scripts/gate.ts,tsc --noEmitanddesign-lintpass.fast.tsnamed 1949 test files, too many to run, so I ran the covering ones myself: the new file,pull-checks-line,asks-expiry,studio, and 20 feed and run test files all pass. Run in one process with allfeed*,asks*andstudio-shippingfiles, six tests inasks.test.tsandasks-expiry.test.tsfail, and main fails the same six the same way. Each of those two files passes on its own.I couldn't record the issue plan or an estimate: the
keep_planandestimatetools aren't available in this session.To try it: open
/askswith a pull assigned to you whose branch conflicts with main. Its card reads "Conflicts in 1 file — assigned to you", and the feed's item for its check says the same.🤖 Generated with Claude Code
Closes #12523