Skip to content

[stable2503] Backport #7402#8013

Closed
paritytech-release-backport-bot[bot] wants to merge 1 commit intostable2503from
backport-7402-to-stable2503
Closed

[stable2503] Backport #7402#8013
paritytech-release-backport-bot[bot] wants to merge 1 commit intostable2503from
backport-7402-to-stable2503

Conversation

@paritytech-release-backport-bot
Copy link
Copy Markdown

Backport #7402 into stable2503 from vgeddes.

See the documentation on how to use this bot.

@paritytech-release-backport-bot
Copy link
Copy Markdown
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

@github-actions github-actions bot added the A3-backport Pull request is already reviewed well in another branch. label Mar 25, 2025
@EgorPopelyaev
Copy link
Copy Markdown
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?

@vgeddes
Copy link
Copy Markdown
Contributor

vgeddes commented Mar 25, 2025

Hi @EgorPopelyaev, yeah I am working through them, there's quite a few.

@vgeddes
Copy link
Copy Markdown
Contributor

vgeddes commented Mar 26, 2025

I don't have perms to write to the backport branch, so instead, I've created a manual backport PR here: #8046

@EgorPopelyaev
Copy link
Copy Markdown
Contributor

@acatangiu the #8048 was merged

@acatangiu
Copy link
Copy Markdown
Contributor

closing in favor of #8058

@acatangiu acatangiu closed this Mar 28, 2025
@EgorPopelyaev EgorPopelyaev deleted the backport-7402-to-stable2503 branch July 17, 2025 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A3-backport Pull request is already reviewed well in another branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants