Repository navigation
D239 — branches up to date before merging: what was checked is what lands (G22) - #435
Merged
Merged
Conversation
…ands (G22) Closes #430. Agent-Session: nstack-os-d239 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
napkinstack-admin
approved these changes
Nov 18, 2026
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.
Closes #430.
Why
On #430's project, two pull requests of one deliverable each turned green on their own base:
minutes/v4;minutes/v4.They merged green one after the other. Together, B1 failed on main: it fires only once a manifest provides v4. No check ever judged the two together. The pre-push hook then refused every push of every contributor for forty minutes.
What
The decider chose the first of three options: G22 is blocking, and
nstack settingsasks for it.flowchart LR A[PR A merges] --> M[main moves] M --> B{PR B up to date with main?} B -->|no: G22 refuses the merge| U[B takes main in, by a merge;<br/>its checks run on main + A + B] U -->|B1 fails in B, main stays green| F[fix in B] U -->|green| G[B merges] B -->|yes| GLegend: what G22 changes once A has merged; only B waits, and only when B and A clash.
nstack doctorG22: branches up to date before merging. It reads the ruleset'sstrict_required_status_checks_policy, or a merge queue, from every ruleset GitHub layers on the branch. G4 now also reads every layer. G22 is blocking and in the private plan's reach list.nstack settingsasks for the required checks up to date. It asked for them not up to date before. On a project whose ruleset is older, it adds a ruleset with the strict rule, and doctor reads both.05-workflow.md, Up to date before merging: three habits that keep it cheap.RULES.mdG22;07-governance.md§7 (the row replaces the merge queue's);INSTALL.md's checklist;platform/README.mdG1–G22. Register row D239.pr-checkjudging the merge again: the forge's Fitness job already runs on the merge at its event, and no run starts when the base moves;Tests
test_up_to_date.py(red on main):run.sh: the compliant fake forge carries strict. The counts follow: OK 28/27, out of reach 11, 21 checklist lines. G22 is among the gaps of a bare repository.nstack settingsadds. G4 and G22 now read every rule, and a test covers it.🤖 Generated with Claude Code