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
523 stars 76 forks source link

failed to cherry pick PR 3536 from corrtia, to branch release-v0.8 #3566

Closed weizhoublue closed 1 month ago

weizhoublue commented 3 months ago

commits a88ea059bf22baf4401c5a7d39496f30788ccef4 of corrtia conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/3536 , action https://github.com/spidernet-io/spiderpool/actions/runs/9397453835 

CONFLICT (modify/delete): docs/usage/rdma-ib-zh_CN.md deleted in HEAD and modified in a88ea059 (Merge pull request #3536 from corrtia/docs-update).  Version a88ea059 (Merge pull request #3536 from corrtia/docs-update) 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 a88ea059 (Merge pull request #3536 from corrtia/docs-update).  Version a88ea059 (Merge pull request #3536 from corrtia/docs-update) 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 a88ea059... Merge pull request #3536 from corrtia/docs-update
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"