search

spidernet-io / spiderpool

Underlay and RDMA network solution of the Kubernetes, for bare metal, VM and any public cloud
https://spidernet-io.github.io/spiderpool/
Apache License 2.0
503 stars 72 forks source link

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

Closed weizhoublue closed 6 days ago

weizhoublue commented 1 week ago

commits ac3b7d6737365f3d8a80e23012d2debe3b1df4c3 of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/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 commented 6 days ago

merged