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

Closed
weizhoublue opened this issue Aug 6, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

Auto-merging charts/spiderpool/README.md
CONFLICT (content): Merge conflict in charts/spiderpool/README.md
Auto-merging charts/spiderpool/templates/configmap.yaml
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in charts/spiderpool/templates/pod.yaml
Auto-merging charts/spiderpool/values.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/values.yaml
Auto-merging cmd/spiderpool-agent/cmd/daemon.go
Auto-merging docs/usage/install/upgrade-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/install/upgrade-zh_CN.md
Auto-merging docs/usage/install/upgrade.md
CONFLICT (content): Merge conflict in docs/usage/install/upgrade.md
Auto-merging docs/usage/spider-subnet-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/spider-subnet-zh_CN.md
Auto-merging docs/usage/spider-subnet.md
CONFLICT (content): Merge conflict in docs/usage/spider-subnet.md
Auto-merging pkg/types/k8s.go
CONFLICT (content): Merge conflict in pkg/types/k8s.go
Auto-merging test/Makefile
CONFLICT (content): Merge conflict in test/Makefile
error: could not apply fc04adf6... Merge pull request #3772 from cyclinder/spiderpoolagent/opt_sysctl
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

#3842

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