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 4098 from cyclinder, to branch release-v0.8 #4107

Closed
weizhoublue opened this issue Sep 25, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 55dbd73 of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4098 , action https://github.com/spidernet-io/spiderpool/actions/runs/11027086897

Auto-merging pkg/coordinatormanager/coordinator_validate.go
Auto-merging test/doc/spidermultus.md
CONFLICT (content): Merge conflict in test/doc/spidermultus.md
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
error: could not apply 55dbd732... Merge pull request #4098 from cyclinder/podMACPrefix/fix1
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"
@cyclinder cyclinder linked a pull request Sep 26, 2024 that will close this issue
@cyclinder cyclinder removed a link to a pull request Sep 26, 2024
@ty-dc
Copy link
Collaborator

ty-dc commented Sep 30, 2024

fix #4129

@ty-dc ty-dc closed this as completed Sep 30, 2024
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.

3 participants