Skip to content

[Backport v4.0-branch] Failed to backport #86648 #90104

Closed
@github-actions

Description

@github-actions

This issue was created automatically because the backport of #86648 to v4.0-branch failed.

The backport to v4.0-branch failed:

Auto-merging subsys/net/lib/http/http_server_core.c
CONFLICT (content): Merge conflict in subsys/net/lib/http/http_server_core.c
Auto-merging tests/net/lib/http_server/common/src/main.c
CONFLICT (content): Merge conflict in tests/net/lib/http_server/common/src/main.c
error: could not apply 33cf7dc78a9... net: http: server: The detail length of wildcard detail was wrong
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-v4.0-branch v4.0-branch
# Navigate to the new working tree
cd .worktrees/backport-v4.0-branch
# Create a new branch
git switch --create backport-86648-to-v4.0-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 0f90affcdfd376f0360317d34b44ce85f28c4294~2..0f90affcdfd376f0360317d34b44ce85f28c4294
# Push it to GitHub
git push --set-upstream origin backport-86648-to-v4.0-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v4.0-branch

Then, create a pull request where the base branch is v4.0-branch and the compare/head branch is backport-86648-to-v4.0-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