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
CONFLICT (modify/delete): docs/usage/install/uninstall-zh_CN.md deleted in HEAD and modified in 0f4724d5 (Merge pull request #3706 from ty-dc/fix/3696). Version 0f4724d5 (Merge pull request #3706 from ty-dc/fix/3696) of docs/usage/install/uninstall-zh_CN.md left in tree.
CONFLICT (modify/delete): docs/usage/install/uninstall.md deleted in HEAD and modified in 0f4724d5 (Merge pull request #3706 from ty-dc/fix/3696). Version 0f4724d5 (Merge pull request #3706 from ty-dc/fix/3696) of docs/usage/install/uninstall.md left in tree.
error: could not apply 0f4724d5... Merge pull request #3706 from ty-dc/fix/3696
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 0f4724d of ty-dc conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #3706 , action https://github.com/spidernet-io/spiderpool/actions/runs/9891803610
The text was updated successfully, but these errors were encountered: