Closed joehoyle closed 4 months ago
Ignoring codeclimate as not needed
The backport to v18-branch
failed:
Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v18-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 v18-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 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v18-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v18-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 v18-branch
and the compare
/head
branch is backport-827-to-v18-branch
.
The backport to v16-branch
failed:
Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v16-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 v16-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 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v16-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v16-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 v16-branch
and the compare
/head
branch is backport-827-to-v16-branch
.
The backport to v17-branch
failed:
Commits ["8036a8c11d218fbd021a229b7e4105cb5ae53b6f","d8a65d438f2debe02e731888092b61ecfd4a9de4","7a145e5f2c6571c7cfafaaf66f16113d3409570d","74ab370d0eb88cf92a58502b98d63f02dc0d5d4c","ffa0a75fa724c882c65011472e185f879dd8741e"] could not be cherry-picked on top of v17-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 v17-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 8036a8c11d218fbd021a229b7e4105cb5ae53b6f d8a65d438f2debe02e731888092b61ecfd4a9de4 7a145e5f2c6571c7cfafaaf66f16113d3409570d 74ab370d0eb88cf92a58502b98d63f02dc0d5d4c ffa0a75fa724c882c65011472e185f879dd8741e
# Create a new branch with these backported commits.
git checkout -b backport-827-to-v17-branch
# Push it to GitHub.
git push --set-upstream origin backport-827-to-v17-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 v17-branch
and the compare
/head
branch is backport-827-to-v17-branch
.
Doh, merge comit