Skip to content

[Backport v3.7-branch] Failed to backport #87097 #87297

Closed
@zephyrbot

Description

@zephyrbot

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

The backport to v3.7-branch failed:

Auto-merging subsys/logging/log_core.c
CONFLICT (content): Merge conflict in subsys/logging/log_core.c
error: could not apply 3fac83151db... logging: Assign IDs to log backends early during log_core_init
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-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-87097-to-v3.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 3fac83151db3ea6f8765c8f6514674f4ce939cd2
# Push it to GitHub
git push --set-upstream origin backport-87097-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-87097-to-v3.7-branch.

Metadata

Metadata

Assignees

Labels

BackportBackport PR and backport failure issues

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions