-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Closed
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues
Description
This issue was created automatically because the backport of #93268 to v4.2-branch
failed.
The backport to v4.2-branch
failed:
To https://github.com/zephyrproject-rtos/zephyr.git
! [rejected] backport-93268-to-v4.2-branch -> backport-93268-to-v4.2-branch (non-fast-forward)
error: failed to push some refs to 'https://github.com/zephyrproject-rtos/zephyr.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
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-93268-to-v4.2-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 8b355e93062474e0c231255f1f354def821c0968~2..8b355e93062474e0c231255f1f354def821c0968
# Push it to GitHub
git push --set-upstream origin backport-93268-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-93268-to-v4.2-branch
.
Metadata
Metadata
Assignees
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues