You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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".
The text was updated successfully, but these errors were encountered:
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
The text was updated successfully, but these errors were encountered: