Rewrite merges-cleanly.sh to relax the condition. #17911
+23
−32
Conversation
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
glyh
changed the title
glyh
changed the title
glyh
force-pushed
the
lyh/new-check-merge-cleanly-script
branch
from
65508f9 to
93c6e0f
Compare
glyh
commented
Oct 13, 2025
| echo "Checking conflicts: (${PR_BRANCH} -> ${BASE_BRANCH}) -> ${SYNC_BRANCH}" | ||
|
|
||
|
|
||
| # Adapted from this stackoverflow answer: https://stackoverflow.com/a/10856937 |
There was a problem hiding this comment.
This comment is not telling what's being done at all.
…> PR_BASE_BRANCH) -> COMPATIBILITY_BRANCH`
glyh
force-pushed
the
lyh/new-check-merge-cleanly-script
branch
from
93c6e0f to
11e8c8a
Compare
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.
This is porting merge-clean script in #17906 to compatible.
The script is completely rewritten, previously we're checking on:
BUILD_BRANCH -> COMPATIBILITY_BRANCHAnd now we're checking on the below instead:
(BUILD_BRANCH -> PR_BASE_BRANCH) -> COMPATIBILITY_BRANCH