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 3011 from Icarus9913, to branch release-v0.7 #3016

Closed
weizhoublue opened this issue Dec 26, 2023 · 0 comments · Fixed by #3022
Closed

failed to cherry pick PR 3011 from Icarus9913, to branch release-v0.7 #3016

weizhoublue opened this issue Dec 26, 2023 · 0 comments · Fixed by #3022
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits df74686 of Icarus9913 conflict when merging to branch release-v0.7, please manually cherry pick it by yourself.
PR #3011 , action https://github.com/spidernet-io/spiderpool/actions/runs/7328889918

Auto-merging test/e2e/ippoolcr/ippoolcr_test.go
CONFLICT (content): Merge conflict in test/e2e/ippoolcr/ippoolcr_test.go
error: could not apply df74686d... Merge pull request #3011 from Icarus9913/fix/wk/pool-inherit
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".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants