-
Notifications
You must be signed in to change notification settings - Fork 8k
Open
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues
Milestone
Description
This issue was created automatically because the backport of #95344 to v4.2-branch
failed.
The backport to v4.2-branch
failed:
Auto-merging .github/workflows/bsim-tests.yaml
Auto-merging .github/workflows/clang.yaml
Auto-merging .github/workflows/codecov.yaml
Auto-merging .github/workflows/errno.yml
CONFLICT (content): Merge conflict in .github/workflows/errno.yml
Auto-merging .github/workflows/footprint-tracking.yml
Auto-merging .github/workflows/twister.yaml
error: could not apply 13ba04fd1fb... ci: Switch to CI image v0.28.4
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 set 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-v4.2-branch v4.2-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.2-branch
# Create a new branch
git switch --create backport-95344-to-v4.2-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 59a5909abbffefa2e65a7374111de5a604a7fe70~2..59a5909abbffefa2e65a7374111de5a604a7fe70
# Push it to GitHub
git push --set-upstream origin backport-95344-to-v4.2-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.2-branch
Then, create a pull request where the base
branch is v4.2-branch
and the compare
/head
branch is backport-95344-to-v4.2-branch
.
Metadata
Metadata
Assignees
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues