Cherry pick #61610 to 24.2: Cancel merges before removing moved parts #62530
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
…partition-and-merges Cancel merges before removing moved parts
robot-ch-test-poll4
added
pr-cherrypick
robot-ch-test-poll4
merged commit ec89126
into
backport/24.2/61610
250 of 267 checks passed
robot-ch-test-poll4
deleted the
cherrypick/24.2/a691d30177cec5da496226a10726e768ea638032
branch
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.
Original pull-request #61610
This pull-request is a first step of an automated backporting.
It contains changes similar to calling
git cherry-picklocally.If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
The check results does not matter at this step - you can safely ignore them.
Note
This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).
Troubleshooting
If the PR was manually reopened after being closed
If this PR is stuck (i.e. not automatically merged after one day), check #61610 for
pr-backports-createdlabel and delete it.Manually merging will do nothing. The
pr-backports-createdlabel prevents the original PR #61610 from being processed.If the conflicts were resolved in a wrong way
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:
pr-cherrypicklabel from the PRYou also need to check the original PR #61610 for
pr-backports-created, and delete if it's presented there