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 README-zh_CN.md
CONFLICT (content): Merge conflict in README-zh_CN.md
Auto-merging docs/README-zh_CN.md
CONFLICT (content): Merge conflict in docs/README-zh_CN.md
error: could not apply cca7b1f8... Merge pull request #3099 from ty-dc/docs/upgrade
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 cca7b1f of ty-dc conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #3099 , action https://github.com/spidernet-io/spiderpool/actions/runs/7554148568
The text was updated successfully, but these errors were encountered: