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

Closed
weizhoublue opened this issue Dec 30, 2024 · 1 comment · Fixed by #4461
Closed

failed to cherry pick PR 4393 from cyclinder, to branch release-v0.9 #4457

weizhoublue opened this issue Dec 30, 2024 · 1 comment · Fixed by #4461
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

Auto-merging charts/spiderpool/README.md
Auto-merging charts/spiderpool/templates/configmap.yaml
Auto-merging charts/spiderpool/templates/daemonset.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/templates/daemonset.yaml
Auto-merging charts/spiderpool/templates/pod.yaml
Auto-merging charts/spiderpool/values.yaml
Auto-merging cmd/spiderpool-controller/cmd/crd_manager.go
Auto-merging test/Makefile
CONFLICT (content): Merge conflict in test/Makefile
Auto-merging test/Makefile.defs
error: could not apply 4f32f5e4... Merge pull request #4393 from cyclinder/multus4.0
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 #4461

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

Successfully merging a pull request may close this issue.

2 participants