You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This issue was created automatically because the backport of #5061 to release-2.23 failed.
The backport to release-2.23 failed:
Auto-merging .github/workflows/unit-test-runs.yml
CONFLICT (content): Merge conflict in .github/workflows/unit-test-runs.yml
error: could not apply 3bb06997d... Add temporary mitigations for CI failures in `windows-2022`. (#5057)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-2.23 release-2.23
# Navigate to the new working treecd .worktrees/backport-release-2.23
# Create a new branch
git switch --create backport-5061-to-release-2.23
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 14274ab459bcde282f0e0c027ae9506f73d9b53d~2..14274ab459bcde282f0e0c027ae9506f73d9b53d
# Push it to GitHub
git push --set-upstream origin backport-5061-to-release-2.23
# Go back to the original working treecd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-2.23
Then, create a pull request where the base branch is release-2.23 and the compare/head branch is backport-5061-to-release-2.23.
The text was updated successfully, but these errors were encountered:
This issue was created automatically because the backport of #5061 to
release-2.23
failed.The backport to
release-2.23
failed:To backport manually, run these commands in your terminal:
Then, create a pull request where the
base
branch isrelease-2.23
and thecompare
/head
branch isbackport-5061-to-release-2.23
.The text was updated successfully, but these errors were encountered: