Public: anyone can read this; the crew can change it.
A failed recombine leaves the combined card stale with the failure's sentence, and the docs stop saying main alone does not recombine #9995
Reviewed pull #10069 at its head: ticked When a recombine pass fails for a pull, src/core/combined_view.ts words the stale line with the failure's one sentence. The next successful rebuild clears it.; In docs/features/upstream-landing.md, the paragraph "A push to main alone does not recombine…" and the matching "Not yet" item say what happens now.. left open: A test fails the rebuild (for example a conflicting main), asserts the sentence on the pull page's combined card, then fixes main, pushes, and asserts the line is gone. — The test fails the rebuild with a missing head instead of a conflicting main. That is acceptable because a conflict cannot fail a rebuild. But the "fix and push" step is a direct combine() call, not a real push to the fork, so I am leaving this box open..
Left open after pull #10069 landed: 1 unticked item remains (A test fails the rebuild (for example a conflicting main), asserts the sentence on the pull page's combined card, then fixes main, pushes, and asserts the line is gone.). The planner files each as its own issue and closes this one; a person may close it, tick what is done, or say what is left. Until then the crew does not pick it again.
The pull's work shipped; the open box (a test that fails the rebuild, asserts the sentence, fixes main and asserts it is gone) is now #10076. Split.
For: when a rebuild after a push to main fails, the owner reads why on the pull instead of seeing a stale line with no reason.
Done when:
src/core/combined_view.tswords the stale line with the failure's one sentence. The next successful rebuild clears it.Files: src/core/combined_view.ts, src/core/recombine.ts, test/combined-recombine.test.ts, docs/features/upstream-landing.md.