Closed etj closed 1 year ago
The backport to 4.1.x
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-4.1.x 4.1.x
# Navigate to the new working tree
cd .worktrees/backport-4.1.x
# Create a new branch
git switch --create backport-465-to-4.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 31d756cde577c787aa568aeb34e582e0d0e1be22
# Push it to GitHub
git push --set-upstream origin backport-465-to-4.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.1.x
Then, create a pull request where the base
branch is 4.1.x
and the compare
/head
branch is backport-465-to-4.1.x
.
@etj can you please resolve the conflicts?