fix(ci): stop skipping conflicts, and let a red base be repaired - #4
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings this repo in line with the rest of the fleet (bitbaum/orangecat#650
and the ports alongside it).
Two ways the merge train reported progress but could not report being stuck:
silence, every sweep, forever. Nothing else will unstick it. Now logged and
written to the job summary;
BEHINDbranches are updated before merging.for an unrelated change and a deadlock when the PR is the fix — it froze
maonakamoto/aoz-housingoutright on 2026-08-07. The sweep now identifieswhich jobs are red and lets a PR through only if its own checks pass every
one of them. Not a weakening: a PR's checks run on the merge result
(
refs/pull/N/merge), so green-on-those-jobs is direct evidence the post-mergebase is better than the pre-merge base.
Still refused: a PR not covering the failing jobs, one covering only some, and a
base failure whose jobs cannot be identified.
Verified against the real script with a fake
ghon PATH, including a base withno CI history at all — where an else-only declaration would trip
set -uandkill the entire sweep.
🤖 Generated with Claude Code