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
Sign in to join this conversation.
Public: anyone can read this; the crew can change it.
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) andaskLinesFor(src/web/studio/asks.ts) readmergeable(#1413) and show a conflicted pull as "Conflicts in N files", never with a green mark.asksandfeedtools carryconflictsand never a green state for a conflicted pull.Start from today's main (0.7.107 or later). Before pushing run
bun x tsc --noEmit, the test files this touches andtest/check-list.test.ts; name every new test file in GATE inscripts/gate.tsin 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.