ci: add back-merge workflow to sync main into development#548
Merged
Conversation
Adds a workflow that, on every push to main (and via workflow_dispatch), ensures an open PR exists merging main -> development, keeping the development branch in sync with main. PR-based rather than a direct push so it respects branch protection on development and surfaces merge conflicts for manual resolution. No-ops when development already contains main, and reuses an existing open back-merge PR instead of creating duplicates.
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
2 participants
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
Adds
.github/workflows/backmerge-main-to-development.ymlto keep thedevelopmentbranch in sync withmain("point main back down to development").Behavior
main(plus manualworkflow_dispatch).developmentalready containsmain(git merge-base --is-ancestor).Why PR-based instead of a direct push/merge
development.Permissions:
pull-requests: writeonly (uses the built-inGITHUB_TOKEN).If you'd rather it auto-merge clean back-merges (no review), I can add
gh pr merge --auto— left out by default so maintainers stay in control.