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

Closed
weizhoublue opened this issue Jun 3, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

Auto-merging docs/mkdocs.yml
CONFLICT (content): Merge conflict in docs/mkdocs.yml
Auto-merging docs/usage/install/overlay/get-started-calico-zh_cn.md
error: could not apply 346ccf45... Merge pull request #3482 from cyclinder/docs/overlay_underlay
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 Jun 27, 2024

fix #3557

@ty-dc ty-dc closed this as completed Jun 27, 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