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

failed to cherry pick PR 3630 from cyclinder, to branch release-v0.8 #3637

Closed
weizhoublue opened this issue Jun 23, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits ac3b7d6 of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #3630 , action https://github.com/spidernet-io/spiderpool/actions/runs/9634136135

CONFLICT (modify/delete): docs/usage/rdma-ib-zh_CN.md deleted in HEAD and modified in ac3b7d67 (Merge pull request #3630 from cyclinder/docs/sriov_operator_worker_label).  Version ac3b7d67 (Merge pull request #3630 from cyclinder/docs/sriov_operator_worker_label) of docs/usage/rdma-ib-zh_CN.md left in tree.
CONFLICT (modify/delete): docs/usage/rdma-ib.md deleted in HEAD and modified in ac3b7d67 (Merge pull request #3630 from cyclinder/docs/sriov_operator_worker_label).  Version ac3b7d67 (Merge pull request #3630 from cyclinder/docs/sriov_operator_worker_label) of docs/usage/rdma-ib.md left in tree.
Auto-merging docs/usage/rdma-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/rdma-zh_CN.md
Auto-merging docs/usage/rdma.md
CONFLICT (content): Merge conflict in docs/usage/rdma.md
error: could not apply ac3b7d67... Merge pull request #3630 from cyclinder/docs/sriov_operator_worker_label
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"
@weizhoublue
Copy link
Collaborator Author

merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants