Closed roborourke closed 1 year ago
That's alright, it's on me to check and these were the only ones I found.
The backport to v4-1-branch
failed:
Commits ["85a8b1a85678145ff0f06fa5941d94d266bcdc60","9d805ad9b800b93deae0762957810d262c5ff553"] could not be cherry-picked on top of v4-1-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 v4-1-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 85a8b1a85678145ff0f06fa5941d94d266bcdc60 9d805ad9b800b93deae0762957810d262c5ff553
# Create a new branch with these backported commits.
git checkout -b backport-546-to-v4-1-branch
# Push it to GitHub.
git push --set-upstream origin backport-546-to-v4-1-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 v4-1-branch
and the compare
/head
branch is backport-546-to-v4-1-branch
.
The backport to v4-3-branch
failed:
Commits ["85a8b1a85678145ff0f06fa5941d94d266bcdc60","9d805ad9b800b93deae0762957810d262c5ff553"] could not be cherry-picked on top of v4-3-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 v4-3-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 85a8b1a85678145ff0f06fa5941d94d266bcdc60 9d805ad9b800b93deae0762957810d262c5ff553
# Create a new branch with these backported commits.
git checkout -b backport-546-to-v4-3-branch
# Push it to GitHub.
git push --set-upstream origin backport-546-to-v4-3-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 v4-3-branch
and the compare
/head
branch is backport-546-to-v4-3-branch
.
Schema properties should have been callbacks.