Repository navigation
ci(release): prepare safe main back-merges - #9
Merged
Merged
Conversation
- Open a draft main-to-develop PR after release or hotfix merges. - Skip synchronized histories and reuse an existing sync PR. - Document repository permissions and the non-squash review flow.
xllily
marked this pull request as ready for review
August 3, 2026 07:04
- Create a disposable sync branch from the latest develop before merging main. - Restrict develop synchronization PRs to generated branch names. - Document approval, merge policy, and stale-branch recovery.
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.
What changed
sync/main-to-develop-<run>-<attempt>branch from the latestdevelopmaininto that temporary branch so released history is retained without modifyingmaindevelopdevelopbranch policyWhy
A direct
maintodeveloppull request is permanently out of date whenever development has advanced. Updating that PR would modifymain, which violates the repository's stable-branch contract. The temporary-branch model keeps both permanent branches protected and gives normal CI a reviewable merge result.Security and behavior
sync/*branchmainanddevelopare never pushed by the workflowcontents: writeandpull-requests: writeValidation
bash -ndevelopandmainas ancestorsmain, malformed sync, and release branchesnpm testpassed: 23 testsgit diff --checkpassedactionlintandshellcheckwere unavailable locally