Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v3.6-branch] Failed to backport #78923 #79101

Closed
zephyrbot opened this issue Sep 27, 2024 · 0 comments
Closed

[Backport v3.6-branch] Failed to backport #78923 #79101

zephyrbot opened this issue Sep 27, 2024 · 0 comments
Assignees
Labels
Backport Backport PR and backport failure issues

Comments

@zephyrbot
Copy link
Collaborator

This issue was created automatically because the backport of #78923 to v3.6-branch failed.

The backport to v3.6-branch failed:

Auto-merging doc/services/device_mgmt/mcumgr.rst
CONFLICT (content): Merge conflict in doc/services/device_mgmt/mcumgr.rst
error: could not apply a8859e7f879... doc: mcumgr: Fix license
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-v3.6-branch v3.6-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.6-branch
# Create a new branch
git switch --create backport-78923-to-v3.6-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 6bca0347df3aa09bb1cfbe15b9cccc3bb0ef7ca2~2..6bca0347df3aa09bb1cfbe15b9cccc3bb0ef7ca2
# Push it to GitHub
git push --set-upstream origin backport-78923-to-v3.6-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.6-branch

Then, create a pull request where the base branch is v3.6-branch and the compare/head branch is backport-78923-to-v3.6-branch.

@zephyrbot zephyrbot added the Backport Backport PR and backport failure issues label Sep 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Backport PR and backport failure issues
Projects
None yet
Development

No branches or pull requests

3 participants