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/coordinator/cmd/cni_types.go
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
CONFLICT (content): Merge conflict in docs/concepts/coordinator.md
Auto-merging pkg/networking/gwconnection/connection.go
CONFLICT (content): Merge conflict in pkg/networking/gwconnection/connection.go
Auto-merging pkg/networking/ipchecking/ipchecking.go
CONFLICT (content): Merge conflict in pkg/networking/ipchecking/ipchecking.go
error: could not apply 5d25b7d8... Merge pull request #4504 from cyclinder/coordinator/detecte
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 5d25b7d of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4504 , action https://github.com/spidernet-io/spiderpool/actions/runs/12592117280
The text was updated successfully, but these errors were encountered: