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

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

Comments

@weizhoublue
Copy link
Collaborator

commits 5aabc1d of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4206 , action https://github.com/spidernet-io/spiderpool/actions/runs/11608076173

Auto-merging api/v1/agent/models/coordinator_config.go
CONFLICT (content): Merge conflict in api/v1/agent/models/coordinator_config.go
Auto-merging api/v1/agent/openapi.yaml
Auto-merging api/v1/agent/server/embedded_spec.go
CONFLICT (content): Merge conflict in api/v1/agent/server/embedded_spec.go
Auto-merging charts/spiderpool/README.md
Auto-merging charts/spiderpool/crds/spiderpool.spidernet.io_spidercoordinators.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/crds/spiderpool.spidernet.io_spidercoordinators.yaml
Auto-merging charts/spiderpool/crds/spiderpool.spidernet.io_spidermultusconfigs.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/crds/spiderpool.spidernet.io_spidermultusconfigs.yaml
Auto-merging charts/spiderpool/templates/pod.yaml
Auto-merging charts/spiderpool/values.yaml
Auto-merging cmd/coordinator/cmd/cni_types.go
Auto-merging cmd/coordinator/cmd/command_add.go
Auto-merging cmd/spiderpool-agent/cmd/coordinator.go
Auto-merging cmd/spiderpool-init/cmd/config.go
Auto-merging cmd/spiderpool-init/cmd/root.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 docs/mkdocs.yml
Auto-merging docs/reference/crd-spidercoordinator.md
CONFLICT (content): Merge conflict in docs/reference/crd-spidercoordinator.md
Auto-merging pkg/coordinatormanager/coordinator_mutate.go
CONFLICT (content): Merge conflict in pkg/coordinatormanager/coordinator_mutate.go
Auto-merging pkg/coordinatormanager/coordinator_validate.go
CONFLICT (content): Merge conflict in pkg/coordinatormanager/coordinator_validate.go
Auto-merging pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/spidercoordinator_types.go
Auto-merging pkg/k8s/apis/spiderpool.spidernet.io/v2beta1/zz_generated.deepcopy.go
Auto-merging pkg/multuscniconfig/multusconfig_informer.go
Auto-merging pkg/multuscniconfig/multusconfig_mutate.go
Auto-merging pkg/multuscniconfig/utils.go
CONFLICT (content): Merge conflict in pkg/multuscniconfig/utils.go
Auto-merging test/doc/spidermultus.md
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
Auto-merging test/scripts/install-multus.sh
error: could not apply 5aabc1d3... Merge pull request #4206 from cyclinder/coordinator/disable_veth0_ip
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

#4261

@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

3 participants