Automate backport merge #84
Open
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
* tries to automatically merge from maint-* branches to a specified list of branches defined in .backport-branches file * if merge conflict occurs, it opens a PR for the maintainer to review
|
Feedback from @pnpavlov: we should open a PR instead of auto merge from maint- to rel- branches. |
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 this PR does / why we need it:
Automatically tries to merge changes in maint-* branches to all rel-* branches specified in .backport-branches file in respective maint-* branch
opens PR if merge conflicts occur, so the maintainer can check and fix manually
Which issue(s) this PR fixes:
Fixes #83
Special notes for your reviewer: