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 Makefile
Auto-merging pkg/coordinatormanager/coordinator_informer.go
CONFLICT (content): Merge conflict in pkg/coordinatormanager/coordinator_informer.go
Auto-merging test/Makefile.defs
Auto-merging test/e2e/spidercoordinator/spidercoordinator_test.go
error: could not apply 6587b383... Merge pull request #4366 from 0x0034/fix/useClusterConfigurationGetCIDR
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 6587b38 of 0x0034 conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4366 , action https://github.com/spidernet-io/spiderpool/actions/runs/12543605870
The text was updated successfully, but these errors were encountered: