docs(runbook): require post-promotion reconciliation - #484
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the branch-protection runbook to prevent main/next history divergence in repositories that use the next → main promotion model, based on observed conflicts after squash promotions.
Changes:
- Strengthens the “main source-branch guard” guidance to validate the PR head repository identity before allowing branch-name patterns.
- Adds a required post-promotion
main→nextreconciliation procedure, including tree-equality and ancestry verification steps. - Explicitly prohibits reset/rebase/force-push/branch replacement as reconciliation shortcuts.
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.
Summary
main-to-nextreconciliation for repositories using thenexttomainmodelEvidence
In
z-shell/zsh-eza, a prior squash promotion left its newmaincommit outsidenext. The next promotion then required a dedicated reconciliation and produced four avoidable workflow conflicts. PRs z-shell/zsh-eza#88 and #90 demonstrate the promotion and immediate ancestry-only back-merge sequence this runbook now documents.Instruction impact review
nexttomainmodel.runbooks/branch-protection.mdremains the correct owner because this is a repeatable branch-protection and promotion procedure.branch-protectionroute already selects this runbook.AGENTS.mdnor an adapter changes.Validation
python3 scripts/validate-agent-policy.pypython3 -m unittest scripts/test_validate_agent_policy.py -v(68 passed)trunk check runbooks/branch-protection.md --no-progressCloses #483