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 3403 from ty-dc, to branch release-v0.9 #3440

Closed
weizhoublue opened this issue Apr 30, 2024 · 0 comments
Closed

failed to cherry pick PR 3403 from ty-dc, to branch release-v0.9 #3440

weizhoublue opened this issue Apr 30, 2024 · 0 comments
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits b50e6c5 of ty-dc conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #3403 , action https://github.com/spidernet-io/spiderpool/actions/runs/8888652209

Auto-merging docs/usage/install/underlay/get-started-ovs-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/install/underlay/get-started-ovs-zh_CN.md
Auto-merging docs/usage/install/underlay/get-started-ovs.md
CONFLICT (content): Merge conflict in docs/usage/install/underlay/get-started-ovs.md
error: could not apply b50e6c5a... Merge pull request #3403 from ty-dc/docs/ovs
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".
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