Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

failed to cherry pick PR 3686 from cyclinder, to branch release-v0.9 #3725

Closed
weizhoublue opened this issue Jul 17, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

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"
@cyclinder
Copy link
Collaborator

#3814

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants