This repository was archived by the owner on Feb 6, 2025. It is now read-only.
Support multiple target branches in pr rebase #1158
Merged
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
jordimassaguerpla
previously approved these changes
Jun 12, 2020
|
The PR rebase logic was not executed: |
pablochacin
force-pushed
the
fix-pr-rebase-logic
branch
3 times, most recently
from
f3b66f8 to
6fc2bbe
Compare
Rebase logic only considers pr with master as target branch. Adapt logic to handle multiple target branches Signed-off-by: Pablo Chacin <pchacin@suse.com>
pablochacin
force-pushed
the
fix-pr-rebase-logic
branch
from
6fc2bbe to
6b886e4
Compare
jordimassaguerpla
approved these changes
Jun 12, 2020
mmnelemane
pushed a commit
to mmnelemane/skuba
that referenced
this pull request
Jul 3, 2020
Rebase logic only considers pr with master as target branch. Adapt logic to handle multiple target branches Signed-off-by: Pablo Chacin <pchacin@suse.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Why is this PR needed?
Rebase logic only considers pr with the master as target branch.
Fixes: https://github.com/SUSE/avant-garde/issues/1696
What does this PR do?
Adapt logic to handle multiple target branches.
Also, remove the use of
Formatfunction which does not exist, but was referenced as a consequence of copy/pasteAnything else a reviewer needs to know?
The whole logic for handling pr validations should be refactored into the jenkins pipeline. This will be introduced into a follow-up PR.
Merge restrictions
(Please do not edit this)
We are in v4-maintenance phase, so we will restrict what can be merged to prevent unexpected surprises: