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 4504 from cyclinder, to branch release-v0.8 #4508

Closed
weizhoublue opened this issue Jan 3, 2025 · 1 comment · Fixed by #4512
Closed

failed to cherry pick PR 4504 from cyclinder, to branch release-v0.8 #4508

weizhoublue opened this issue Jan 3, 2025 · 1 comment · Fixed by #4512
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants