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.7-branch] Failed to backport #79902 #80133

Open
zephyrbot opened this issue Oct 21, 2024 · 0 comments · May be fixed by #80140
Open

[Backport v3.7-branch] Failed to backport #79902 #80133

zephyrbot opened this issue Oct 21, 2024 · 0 comments · May be fixed by #80140
Assignees
Labels
area: mbedTLS / PSA Crypto Backport Backport PR and backport failure issues

Comments

@zephyrbot
Copy link
Collaborator

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

The backport to v3.7-branch failed:

CONFLICT (modify/delete): doc/releases/release-notes-4.0.rst deleted in HEAD and modified in d6348cd22a3 (mbedtls: update to 3.6.2).  Version d6348cd22a3 (mbedtls: update to 3.6.2) of doc/releases/release-notes-4.0.rst left in tree.
Auto-merging west.yml
CONFLICT (content): Merge conflict in west.yml
error: could not apply d6348cd22a3... mbedtls: update to 3.6.2
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.7-branch v3.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v3.7-branch
# Create a new branch
git switch --create backport-79902-to-v3.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x d6348cd22a38e6de74299bb07c7bf2e0fb90fa61
# Push it to GitHub
git push --set-upstream origin backport-79902-to-v3.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.7-branch

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

@zephyrbot zephyrbot added the Backport Backport PR and backport failure issues label Oct 21, 2024
@tomi-font tomi-font linked a pull request Oct 21, 2024 that will close this issue
@tomi-font tomi-font linked a pull request Oct 21, 2024 that will close this issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: mbedTLS / PSA Crypto Backport Backport PR and backport failure issues
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants