[stable2503] Backport #7402#8013
Closed
paritytech-release-backport-bot[bot] wants to merge 1 commit intostable2503from
Closed
[stable2503] Backport #7402#8013paritytech-release-backport-bot[bot] wants to merge 1 commit intostable2503from
paritytech-release-backport-bot[bot] wants to merge 1 commit intostable2503from
Conversation
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-7402-to-stable2503
git worktree add --checkout .worktree/backport-7402-to-stable2503 backport-7402-to-stable2503
cd .worktree/backport-7402-to-stable2503
git reset --hard HEAD^
git cherry-pick -x 98c6ffcea6794d338514cf9bd84446d2f276cb63
git push --force-with-lease |
Merged
Contributor
|
@vgeddes Hey Vincent, there are some traces of the conflict resolutions in this PR like this one, could you please have a look and resolve those to make it mergeable? |
Contributor
|
Hi @EgorPopelyaev, yeah I am working through them, there's quite a few. |
Contributor
|
I don't have perms to write to the backport branch, so instead, I've created a manual backport PR here: #8046 |
This was referenced Mar 26, 2025
Contributor
|
@acatangiu the #8048 was merged |
Contributor
|
closing in favor of #8058 |
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 #7402 into
stable2503from vgeddes.See the documentation on how to use this bot.