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
Auto-merging cmd/spiderpool-agent/cmd/daemon.go
Auto-merging cmd/spiderpool-controller/cmd/crd_manager.go
Auto-merging docs/concepts/arch-zh_CN.md
CONFLICT (content): Merge conflict in docs/concepts/arch-zh_CN.md
Auto-merging docs/concepts/coordinator-zh_CN.md
CONFLICT (content): Merge conflict in docs/concepts/coordinator-zh_CN.md
Auto-merging docs/concepts/coordinator.md
Auto-merging pkg/coordinatormanager/coordinator_validate.go
Auto-merging pkg/ip/cidr.go
Auto-merging pkg/multuscniconfig/multusconfig_validate.go
CONFLICT (content): Merge conflict in pkg/multuscniconfig/multusconfig_validate.go
error: could not apply 3e1d46b0... Merge pull request #4157 from ty-dc/fix/scall-all
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 3e1d46b of ty-dc conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4157 , action https://github.com/spidernet-io/spiderpool/actions/runs/11608063397
The text was updated successfully, but these errors were encountered: