Create a PR to merge a maintenance branch into the next one on push #2320
Conversation
This file contains 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
|
This action uses the maintenance branch itself for the PR to keep things simple. If we run into conflicts too often (for example, with the change log), we may have to switch to creating a merge branch first and using that. |
alexanderpann
approved these changes
Nov 10, 2023
|
I have debugged the workflow here, committing the final version. It will use the merge branch because I expect that conflicts will happen quite often because of the changelog, and also because we may want to add some sort of automated migration logic later. |
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.
When a maintenance branch pushed, create a PR to merge changes into the next version.