A rebuild that stopped
A kept fork's pull is built as main merged into its head (combined/N). When main deletes, renames or changes the mode of a file the pull also changed, no side can be picked for it, and nothing lands that nobody chose (#12151). The rebuild stops and the pull says so:
- "The rebuild stopped: gone.txt was deleted, renamed or changed in a way that conflicts with main, and no side is picked for it. Push to the fork with it resolved."
- If
combined/Nholds only the forge's own combinings, it is deleted: the card reads "Not combined with main" and the pull answers as its head does (conflicting with main). - If it carries someone's own commits, it is kept as it was, and the card reads "Combined with main · stale" with the sentence under it.
- Other stops word themselves: "The rebuild failed: the pull's head is missing…", "…git could not merge main into the pull's head", and "The rebuild failed unexpectedly" (the detail is in the log). A good rebuild clears the sentence.
- A landing rebuilds the other kept forks' branches as a push to main does; passes never overlap, and calls during one share it (
core/recombine.ts).
- Web: the combined card on the pull. Terminal: the same card in
forge tui's pull screen. Both readcombinedView()andcombinedWords()insrc/core/combined_view.ts. - Try it: open a pull from a kept fork that edits a file, delete that file on main, open the pull.
- Tests:
test/combined-git.test.ts,test/combined-recombine.test.ts.