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/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"
The text was updated successfully, but these errors were encountered:
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
The text was updated successfully, but these errors were encountered: