spiderpool icon indicating copy to clipboard operation
spiderpool copied to clipboard

failed to cherry pick PR 4196 from ty-dc, to branch release-v0.9

Open weizhoublue opened this issue 4 months ago • 0 comments

commits a810abd2711d2fa46361ca45c1c4d539774cf74b of ty-dc conflict when merging to branch release-v0.9, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/4196 , action https://github.com/spidernet-io/spiderpool/actions/runs/11514732841

CONFLICT (modify/delete): docs/usage/dra.md deleted in HEAD and modified in a810abd2 (Merge pull request #4196 from ty-dc/fix/ipam-image).  Version a810abd2 (Merge pull request #4196 from ty-dc/fix/ipam-image) of docs/usage/dra.md left in tree.
CONFLICT (modify/delete): docs/usage/dra_zh_CN.md deleted in HEAD and modified in a810abd2 (Merge pull request #4196 from ty-dc/fix/ipam-image).  Version a810abd2 (Merge pull request #4196 from ty-dc/fix/ipam-image) of docs/usage/dra_zh_CN.md left in tree.
Auto-merging docs/usage/readme-zh_CN.md
Auto-merging docs/usage/spider-multus-config-zh_CN.md
Auto-merging docs/usage/spider-multus-config.md
Auto-merging docs/usage/underlay_cni_service-zh_CN.md
error: could not apply a810abd2... Merge pull request #4196 from ty-dc/fix/ipam-image
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 avatar Oct 25 '24 08:10 weizhoublue