Fast-forward master to origin/dev instead of a release PR - #171
Merged
Conversation
GitHub no longer requires a PR on master; force-push stays off so the branch can only move forward. Local hooks allow pushing master only when the new SHA is current origin/dev.
Also fix review-gate docs: review-received is required on dev only.
AdamSpitz
commented
Sep 8, 2026
AdamSpitz
left a comment
AdamSpitz
left a comment
Owner
Author
There was a problem hiding this comment.
Review receipt.
Reviewed the promote-path change: master is a FF of origin/dev, no release PR. Hooks, protect-branches.sh, AGENTS.md, branching.md, and the PR template agree. No findings.
Reviewed-with: grok
Reviewed-files: 14
Reviewed-commit: 6f7a46a
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
1 participant
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.
Turn off the GitHub PR requirement on
masterso release can be a real fast-forward oforigin/devontomaster(same SHA, no merge commit, no back-merge).scripts/protect-branches.shis already applied on GitHub:masterstill forbids force-push and delete;devis unchanged.Use
scripts/promote-dev-to-master.sh. One leftover from PR #170: trees match butmasteris not an ancestor ofdev, so the first catch-up needs a one-time force (--reset-master-to-devafter temporarily allowing force-push).