-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Closed
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues
Description
This issue was created automatically because the backport of #57403 to v2.7-branch failed.
The backport to v2.7-branch failed:
Auto-merging tests/posix/common/src/pthread.c
CONFLICT (content): Merge conflict in tests/posix/common/src/pthread.c
error: could not apply 7c17bda3c2... tests: posix: pthread: init pthread_attr_t on each iteration
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".
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-57403-to-v2.7-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick -x 12ed08a2fb02515b2469f3e7d0f91ae4b03ea83e~2..12ed08a2fb02515b2469f3e7d0f91ae4b03ea83e
# Push it to GitHub
git push --set-upstream origin backport-57403-to-v2.7-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v2.7-branchThen, create a pull request where the base branch is v2.7-branch and the compare/head branch is backport-57403-to-v2.7-branch.
Metadata
Metadata
Assignees
Labels
BackportBackport PR and backport failure issuesBackport PR and backport failure issues