chore: add script to sync release branches#10394
Merged
paulbalandan merged 1 commit intoJul 8, 2026
Merged
Conversation
michalsn
approved these changes
Jul 8, 2026
52fc230 to
043bb4a
Compare
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.
Description
Final piece of the release automation series (#10390, #10391, #10392, #10393). RELEASE.md contained three nearly identical fetch/merge/push blocks that the release manager typed out by hand: merging
developinto the next minor branch before the release, fast-forwardingdevelopfrommasterafter it, and updating the next minor branch again.New script
admin/sync-release-branches.php:php admin/sync-release-branches.php <target> <source> [--push], e.g.4.8 develop --push(merges develop into 4.8) ordevelop master --push(merges master into develop).git fetch upstream, check out<target>(creating it fromupstream/<target>if there is no local branch),git merge upstream/<target>,git merge upstream/<source>, and only with the explicit--pushflag,git push upstream HEAD. Without--pushit stops so the merge result can be reviewed first.develop,master, orX.Y, target and source must differ, theupstreamremote must be configured, and the working tree must be clean.git merge --continue, and push, leaving the merge in progress for the release manager.Also included:
--pushrun, the review-first run, the conflict exit, the dirty-tree guard, and the create-missing-local-branch case.Checklist: