Check merged upstream PR is included in source branch before dropping#64
Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-eng:mainfrom Jul 23, 2025
Merged
Conversation
openshift-ci
bot
added
the
do-not-merge/work-in-progress
Contributor
|
Skipping CI for Draft Pull Request. |
openshift-ci
bot
added
the
approved
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: damdo, RadekManak The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
RadekManak
force-pushed
the
check_pr_included
branch
from
94969f8 to
2d4d88e
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
RadekManak
force-pushed
the
check_pr_included
branch
from
2d4d88e to
2383be4
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
2 participants
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.
We were blindly dropping commits with merged upstream PR regardless of the branch that it merged into.
This caused commit being erroneously dropped when rebasing from release tag and the PR was only in main.
Now merge_commit_sha of the PR is checked if it is present it the source branch before dropping it.