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 4157 from ty-dc, to branch release-v0.8 #4247

Closed
weizhoublue opened this issue Oct 31, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 3e1d46b of ty-dc conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4157 , action https://github.com/spidernet-io/spiderpool/actions/runs/11608063397

Auto-merging cmd/spiderpool-agent/cmd/daemon.go
Auto-merging cmd/spiderpool-controller/cmd/crd_manager.go
Auto-merging docs/concepts/arch-zh_CN.md
CONFLICT (content): Merge conflict in docs/concepts/arch-zh_CN.md
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
Auto-merging pkg/coordinatormanager/coordinator_validate.go
Auto-merging pkg/ip/cidr.go
Auto-merging pkg/multuscniconfig/multusconfig_validate.go
CONFLICT (content): Merge conflict in pkg/multuscniconfig/multusconfig_validate.go
error: could not apply 3e1d46b0... Merge pull request #4157 from ty-dc/fix/scall-all
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"
@ty-dc
Copy link
Collaborator

ty-dc commented Nov 5, 2024

#4253

@ty-dc ty-dc closed this as completed Nov 5, 2024
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