Closed roborourke closed 2 years ago
The backport to v7-branch
failed:
Commits ["1916e7347ef2946fd569a28f7d327cba3a7227ab"] could not be cherry-picked on top of v7-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 v7-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 1916e7347ef2946fd569a28f7d327cba3a7227ab
# Create a new branch with these backported commits.
git checkout -b backport-254-to-v7-branch
# Push it to GitHub.
git push --set-upstream origin backport-254-to-v7-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 v7-branch
and the compare
/head
branch is backport-254-to-v7-branch
.
The backport to v8-branch
failed:
Commits ["1916e7347ef2946fd569a28f7d327cba3a7227ab"] could not be cherry-picked on top of v8-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 v8-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 1916e7347ef2946fd569a28f7d327cba3a7227ab
# Create a new branch with these backported commits.
git checkout -b backport-254-to-v8-branch
# Push it to GitHub.
git push --set-upstream origin backport-254-to-v8-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 v8-branch
and the compare
/head
branch is backport-254-to-v8-branch
.
The backport to v9-branch
failed:
Commits ["1916e7347ef2946fd569a28f7d327cba3a7227ab"] could not be cherry-picked on top of v9-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 v9-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 1916e7347ef2946fd569a28f7d327cba3a7227ab
# Create a new branch with these backported commits.
git checkout -b backport-254-to-v9-branch
# Push it to GitHub.
git push --set-upstream origin backport-254-to-v9-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 v9-branch
and the compare
/head
branch is backport-254-to-v9-branch
.
This should have been done after the merge of Altis Experiments into the main analytics plugin in v7, my fault that it got missed.