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 v2.7-branch] Failed to backport #79830 #80460

Closed
zephyrbot opened this issue Oct 25, 2024 · 1 comment · Fixed by #80615
Closed

[Backport v2.7-branch] Failed to backport #79830 #80460

zephyrbot opened this issue Oct 25, 2024 · 1 comment · Fixed by #80615
Assignees
Labels
area: Flash Backport Backport PR and backport failure issues Stale

Comments

@zephyrbot
Copy link
Collaborator

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

The backport to v2.7-branch failed:

Auto-merging include/storage/stream_flash.h
Auto-merging subsys/storage/stream/stream_flash.c
CONFLICT (content): Merge conflict in subsys/storage/stream/stream_flash.c
error: could not apply 8714c172edd... storage/stream_flash: Fix range check in stream_flash_erase_page
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-v2.7-branch v2.7-branch
# Navigate to the new working tree
cd .worktrees/backport-v2.7-branch
# Create a new branch
git switch --create backport-79830-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 23805301b0046fe531553c0a094c1cef63c62cb0~2..23805301b0046fe531553c0a094c1cef63c62cb0
# Push it to GitHub
git push --set-upstream origin backport-79830-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branch

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

Copy link

This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.

@github-actions github-actions bot added the Stale label Dec 26, 2024
@github-actions github-actions bot closed this as not planned Won't fix, can't repro, duplicate, stale Jan 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Flash Backport Backport PR and backport failure issues Stale
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants