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 test/doc/coordinator.md
CONFLICT (content): Merge conflict in test/doc/coordinator.md
Auto-merging test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go
CONFLICT (content): Merge conflict in test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go
error: could not apply 93f2665f... Merge pull request #3686 from cyclinder/coordinator/overlay_policy_routing
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 93f2665 of cyclinder conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #3686 , action https://github.com/spidernet-io/spiderpool/actions/runs/9966977481
The text was updated successfully, but these errors were encountered: