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 4322 from cyclinder, to branch release-v1.0 #4329

Closed
weizhoublue opened this issue Nov 27, 2024 · 0 comments · Fixed by #4330
Closed

failed to cherry pick PR 4322 from cyclinder, to branch release-v1.0 #4329

weizhoublue opened this issue Nov 27, 2024 · 0 comments · Fixed by #4330
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits b6d671a of cyclinder conflict when merging to branch release-v1.0, please manually cherry pick it by yourself.
PR #4322 , action https://github.com/spidernet-io/spiderpool/actions/runs/12049544093

Auto-merging charts/spiderpool/templates/daemonset.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/templates/daemonset.yaml
Auto-merging pkg/podmanager/utils.go
error: could not apply b6d671ab2... Merge pull request #4322 from cyclinder/charts/fix_daemonset
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
Development

Successfully merging a pull request may close this issue.

3 participants