docs: Add instruction to merge release branch back to main in release guide - #3085
Draft
dannycjones wants to merge 1 commit into
Draft
docs: Add instruction to merge release branch back to main in release guide#3085dannycjones wants to merge 1 commit into
dannycjones wants to merge 1 commit into
Conversation
dannycjones
commented
Aug 27, 2026
Comment on lines
+610
to
+616
| Create a pull request that pulls back the changes from the release branch. | ||
| To prepare the pull request, | ||
| create a merge commit from the release branch into main, | ||
| run `make generate-public-api` and `./dev/release/dependencies.sh generate`, | ||
| and open the pull request with both changes. | ||
|
|
||
| Once merged into `main`, `main` is then ready for future release branches being cut from it. |
Contributor
Author
There was a problem hiding this comment.
This documents what I've done for 0.10.1, however I think this falls apart if we're doing a patch release for an older minor version.
Ultimately, I'm wondering if we need a set of rules to say: if a change needs making to a release branch, it must first be made on main (where applicable) and a second PR must cherry-pick (or effectively cherry-pick) that change on to the release branch. Presumably we would need to do that for changelog? OR maybe changelog is one where we reverse backport it...
Open to thoughts here.
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.
Which issue does this PR close?
Addresses action item in #2864.
What changes are included in this PR?
Add note to release guide to instruct release manager to merge release branch back into
mainfollowing each release.Are these changes tested?
N/A
AI Disclosure
No AI was used in this change.