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

Closed
weizhoublue opened this issue Jan 17, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

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".
@ty-dc
Copy link
Collaborator

ty-dc commented Jan 17, 2024

fix #3104

@ty-dc ty-dc closed this as completed Jan 17, 2024
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