Closed Sephsekla closed 2 years ago
The backport to v8-branch
failed:
Commits ["0d7a89bebe5fdaf32e9c3a8484142152c3d2a334"] 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 0d7a89bebe5fdaf32e9c3a8484142152c3d2a334
# Create a new branch with these backported commits.
git checkout -b backport-311-to-v8-branch
# Push it to GitHub.
git push --set-upstream origin backport-311-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-311-to-v8-branch
.
The backport to v9-branch
failed:
Commits ["0d7a89bebe5fdaf32e9c3a8484142152c3d2a334"] 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 0d7a89bebe5fdaf32e9c3a8484142152c3d2a334
# Create a new branch with these backported commits.
git checkout -b backport-311-to-v9-branch
# Push it to GitHub.
git push --set-upstream origin backport-311-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-311-to-v9-branch
.
The backport to v10-branch
failed:
Commits ["0d7a89bebe5fdaf32e9c3a8484142152c3d2a334"] 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 0d7a89bebe5fdaf32e9c3a8484142152c3d2a334
# Create a new branch with these backported commits.
git checkout -b backport-311-to-v10-branch
# Push it to GitHub.
git push --set-upstream origin backport-311-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-311-to-v10-branch
.
@Sephsekla patches don't apply cleanly, I won't have time to make these backports today, possibly Friday.
@roborourke thanks, I appreciate it!
FYI if you're in a rush you can follow the backport steps in the comments above for the failed branches and tag me to review.
@roborourke if I have some time today I can look at doing that, it's not a huge rush but it might be interesting. Can't say I've had to do a lot of cherry picking stuff in the past.
Updates the
hm-gtm
dependency to use 2.1.0 or above. See discussion on https://github.com/humanmade/hm-gtm/pull/30If this could be backported to the V8 branch I would deeply appreciate it 🥺
Changelog
2.1.0
2.0.8