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

Home, asks, the feed and MCP `asks`/`feed` never mark a conflicted pull green: they say "Conflicts in N files" #1689

shipped production is serving it opened this has it
opened this

Replaces #1587, unchanged in scope; both tries went red only because their branch predated main's changes to the home and asks tests.

Done looks like:

  • [ ] onYouCard (src/web/pages/site.ts) and askLinesFor (src/web/studio/asks.ts) read mergeable (#1413) and show a conflicted pull as "Conflicts in N files", never with a green mark.
  • [ ] Feed items and the MCP asks and feed tools carry conflicts and never a green state for a conflicted pull.
  • [ ] Tests on the home, the asks page, the feed and the MCP: a conflicted pull with a passing check is not green. Run test/home-feed.test.ts, test/asks.test.ts and test/asks-bulk.test.ts before pushing.

Start from today's main (0.7.107 or later). Before pushing run bun x tsc --noEmit, the test files this touches and test/check-list.test.ts; name every new test file in GATE in scripts/gate.ts in the same commit. Earlier tries went red because their branch was cut before main changed the home and asks tests: if the check is red on a test this pull does not touch, merge origin/main, run that test here, and push again; if it is still red, name it in the pull.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs