Merged
Conversation
Contributor
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-7451-to-stable2412
git worktree add --checkout .worktree/backport-7451-to-stable2412 backport-7451-to-stable2412
cd .worktree/backport-7451-to-stable2412
git reset --hard HEAD^
git cherry-pick -x 9c474d5452a855adc843785c71fc842f81eeed56
git push --force-with-lease |
Contributor
|
This pull request is amending an existing release. Please proceed with extreme caution,
Emergency Bypass
If you really need to bypass this check: add |
lexnv
previously approved these changes
Feb 5, 2025
Contributor
|
@EgorPopelyaev The others where not necessary after all, forgot about that. This one is ready 👍. No idea why the bot was reporting conflicts, I double checked and compiled locally 🤷♂️. |
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
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.
Backport #7451 into
stable2412from skunert.See the documentation on how to use this bot.