ci: auto-sync dev from main after every prod merge - #1375
Merged
Conversation
Enforces AGENTS.md fast-forward rule. Every push on main triggers: 1. ff dev to main if possible 2. real merge commit if ff isn't possible but git can resolve 3. auto-PR sync/main-to-dev-<sha> if git can't resolve conflicts Stops the divergence-drift pattern that put dev 111 commits behind main.
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.
What
New GitHub Action
.github/workflows/sync-dev-from-main.yml. On every push to `main`:Why
AGENTS.md already says "immediately fast-forward dev from main after a hotfix" but the step got skipped often enough for `dev` to drift 111 commits behind `main`. This bot enforces it going forward — the divergence stops accumulating.
Does NOT touch the current divergence (that's a separate cleanup PR, sync week TBD).
Notes