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 3536 from corrtia, to branch release-v0.8 #3566

Open
weizhoublue opened this issue Jun 6, 2024 · 0 comments
Open
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits a88ea05 of corrtia conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #3536 , action https://github.com/spidernet-io/spiderpool/actions/runs/9397453835

CONFLICT (modify/delete): docs/usage/rdma-ib-zh_CN.md deleted in HEAD and modified in a88ea059 (Merge pull request #3536 from corrtia/docs-update).  Version a88ea059 (Merge pull request #3536 from corrtia/docs-update) of docs/usage/rdma-ib-zh_CN.md left in tree.
CONFLICT (modify/delete): docs/usage/rdma-ib.md deleted in HEAD and modified in a88ea059 (Merge pull request #3536 from corrtia/docs-update).  Version a88ea059 (Merge pull request #3536 from corrtia/docs-update) of docs/usage/rdma-ib.md left in tree.
Auto-merging docs/usage/rdma-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/rdma-zh_CN.md
Auto-merging docs/usage/rdma.md
CONFLICT (content): Merge conflict in docs/usage/rdma.md
error: could not apply a88ea059... Merge pull request #3536 from corrtia/docs-update
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"
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

1 participant