-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Closed
Labels
Description
This issue was created automatically because the backport of #45971 to v3.1-branch failed.
The backport to v3.1-branch failed:
The process '/usr/bin/git' failed with exit code 1
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-v3.1-branch v3.1-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.1-branch
# Create a new branch
git switch --create backport-45971-to-v3.1-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x f09220d05028dfa87f39fb3b317eb3488c90a139~2..f09220d05028dfa87f39fb3b317eb3488c90a139
# Push it to GitHub
git push --set-upstream origin backport-45971-to-v3.1-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.1-branchThen, create a pull request where the base branch is v3.1-branch and the compare/head branch is backport-45971-to-v3.1-branch.