Skip to content

Cherry pick #73504 to 24.12: Fix if condition in #63151#73791

Merged
robot-ch-test-poll merged 5 commits intobackport/24.12/73504from
cherrypick/24.12/73504
Dec 24, 2024
Merged

Cherry pick #73504 to 24.12: Fix if condition in #63151#73791
robot-ch-test-poll merged 5 commits intobackport/24.12/73504from
cherrypick/24.12/73504

Conversation

@robot-ch-test-poll
Copy link
Contributor

Original pull-request #73504

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
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 #73504 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #73504 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:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #73504 for pr-backports-created, and delete if it's presented there

@robot-ch-test-poll robot-ch-test-poll added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels Dec 24, 2024
@robot-ch-test-poll robot-ch-test-poll merged commit 5711a2f into backport/24.12/73504 Dec 24, 2024
@robot-ch-test-poll robot-ch-test-poll deleted the cherrypick/24.12/73504 branch December 24, 2024 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants