[Backport release-2.22] Failed to backport #4865

[github-actions]

This issue was created automatically because the backport of #4865 to release-2.22 failed.

The backport to release-2.22 failed:

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-4865-to-release-2.22
You are currently cherry-picking commit d7b798bf1.
  (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.22 release-2.22
# Navigate to the new working tree
cd .worktrees/backport-release-2.22
# Create a new branch
git switch --create backport-4865-to-release-2.22
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 8046ae2c8a0ee3d1edf888aefea60adb2dbdc23c~2..8046ae2c8a0ee3d1edf888aefea60adb2dbdc23c
# Push it to GitHub
git push --set-upstream origin backport-4865-to-release-2.22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-2.22

Then, create a pull request where the base branch is release-2.22 and the compare/head branch is backport-4865-to-release-2.22.