Closed shadyvb closed 2 years ago
The backport to v10-branch
failed:
Commits ["67e1c7fb1ccb139c5253eff3e2b69fd5a18baa12","7acc77cdc7572d8daf647c1203d6fbe9bb66bf8c"] could not be cherry-picked on top of v10-branch
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v10-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 67e1c7fb1ccb139c5253eff3e2b69fd5a18baa12 7acc77cdc7572d8daf647c1203d6fbe9bb66bf8c
# Create a new branch with these backported commits.
git checkout -b backport-130-to-v10-branch
# Push it to GitHub.
git push --set-upstream origin backport-130-to-v10-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport
Then, create a pull request where the base
branch is v10-branch
and the compare
/head
branch is backport-130-to-v10-branch
.
Ref https://github.com/humanmade/altis-dev-tools/issues/288