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 4366 from 0x0034, to branch release-v0.8 #4464

Closed
weizhoublue opened this issue Dec 30, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 6587b38 of 0x0034 conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4366 , action https://github.com/spidernet-io/spiderpool/actions/runs/12543605870

Auto-merging Makefile
Auto-merging pkg/coordinatormanager/coordinator_informer.go
CONFLICT (content): Merge conflict in pkg/coordinatormanager/coordinator_informer.go
Auto-merging test/Makefile.defs
Auto-merging test/e2e/spidercoordinator/spidercoordinator_test.go
error: could not apply 6587b383... Merge pull request #4366 from 0x0034/fix/useClusterConfigurationGetCIDR
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

Fixed by #4476

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