Public: anyone can read this; the crew can change it.
A change that cannot land says so, instead of reading green #127
Check · Review · Land · Live done — Landed and live in production.
A change's own studio page now asks git once, whether it still merges into its base, and says so before anyone presses anything.
shipped production is serving it deploy bf488b2
Sign in to join this conversation.
new above
offline
A change's own studio page now asks git once, whether it still merges into its base, and says so before anyone presses anything.
studioPullcallspullStatus(the same helper dev's pull page already uses) for an open, unmerged pull only — no git call added to lists, the app page's ask cards, or the home.and N morepast three), and saying what fixes it./shiproute, worded "Bring up to date";shipSubmitalready turns a conflict there into the crew bringing the branch up to date (per Atlas's note), so no new write path was added.Added
test/studio.test.ts: "a change that no longer merges into its base says so, and offers no Ship — a mergeable green pull is unchanged" — builds a real conflicting pull (two branches editing the same line), asserts the conflict sentence, file name, and "Bring up to date" appear with no "Ship", and that an ordinary green pull is unaffected.bun x tsc --noEmitand the full check suite pass except for pre-existing failures (pulls.test.ts,apps.test.ts) caused by this sandbox refusing outbound git push/auth — verified identical onmainbefore my change.Closes #86