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
505 stars 72 forks source link

failed to cherry pick PR 3482 from cyclinder, to branch release-v0.8 #3552

Closed weizhoublue closed 1 week ago

weizhoublue commented 1 month ago

commits 346ccf45ebb49a742488e8d5578efdb7b793d077 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/3482 , action https://github.com/spidernet-io/spiderpool/actions/runs/9343455742

Auto-merging docs/mkdocs.yml
CONFLICT (content): Merge conflict in docs/mkdocs.yml
Auto-merging docs/usage/install/overlay/get-started-calico-zh_cn.md
error: could not apply 346ccf45... Merge pull request #3482 from cyclinder/docs/overlay_underlay
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"
ty-dc commented 1 week ago

fix #3557