This issue was created automatically because the backport of #5135 to release-2.25 failed.
The backport to release-2.25 failed:
[backport-5135-to-release-2.25 3fe431f47] Replace `dump` functions with `operator<<` overloads (#5026)
Author: Agisilaos Kounelis <[email protected]>
Date: Tue Jul 9 21:07:52 2024 +0300
88 files changed, 858 insertions(+), 563 deletions(-)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git cherry-pick --skip'
On branch backport-5135-to-release-2.25
You are currently cherry-picking commit 7b88c3e19.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
nothing to commit, working tree clean
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-2.25 release-2.25
# Navigate to the new working tree
cd .worktrees/backport-release-2.25
# Create a new branch
git switch --create backport-5135-to-release-2.25
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x a7e2a07d6c74208f691ec8d3c94be17c9de12ab8~8..a7e2a07d6c74208f691ec8d3c94be17c9de12ab8
# Push it to GitHub
git push --set-upstream origin backport-5135-to-release-2.25
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-2.25
Then, create a pull request where the base branch is release-2.25 and the compare/head branch is backport-5135-to-release-2.25.
This issue was created automatically because the backport of #5135 to
release-2.25failed.The backport to
release-2.25failed:To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch isrelease-2.25and thecompare/headbranch isbackport-5135-to-release-2.25.