You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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"
The text was updated successfully, but these errors were encountered:
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
The text was updated successfully, but these errors were encountered: