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 4474 from cyclinder, to branch release-v0.9 #4483

Closed
weizhoublue opened this issue Dec 31, 2024 · 1 comment · Fixed by #4506
Closed

failed to cherry pick PR 4474 from cyclinder, to branch release-v0.9 #4483

weizhoublue opened this issue Dec 31, 2024 · 1 comment · Fixed by #4506
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 109eac8 of cyclinder conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #4474 , action https://github.com/spidernet-io/spiderpool/actions/runs/12559695051

Auto-merging .github/workflows/trivy-scan-image.yaml
CONFLICT (content): Merge conflict in .github/workflows/trivy-scan-image.yaml
Auto-merging docs/concepts/coordinator.md
Auto-merging test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go
error: could not apply 109eac8a... Merge pull request #4474 from cyclinder/coordinator/serial_detect
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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants