Closed jmckenna closed 3 months ago
The backport to branch-8-2
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-branch-8-2 branch-8-2
# Navigate to the new working tree
cd .worktrees/backport-branch-8-2
# Create a new branch
git switch --create backport-949-to-branch-8-2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick da7b83b12d0522c1e06471286b23244bd5963856,406a82c761c8fd95533c1cd6321d5621f7faa992,627d2a02918b4b2eca4d0f9fc4eb5ba46c829cab,2b3e060198c5fc4a27f6a32b2194e6fa8cae8edd
# Push it to GitHub
git push --set-upstream origin backport-949-to-branch-8-2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-2
Then, create a pull request where the base
branch is branch-8-2
and the compare
/head
branch is backport-949-to-branch-8-2
.