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 pkg/coordinatormanager/coordinator_validate.go
Auto-merging test/doc/spidermultus.md
CONFLICT (content): Merge conflict in test/doc/spidermultus.md
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
error: could not apply 55dbd732... Merge pull request #4098 from cyclinder/podMACPrefix/fix1
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 55dbd73 of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4098 , action https://github.com/spidernet-io/spiderpool/actions/runs/11027086897
The text was updated successfully, but these errors were encountered: