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 auto cherry pick PR 4681 to branch release-v0.9 #4682

Closed
github-actions bot opened this issue Feb 24, 2025 · 0 comments
Closed

failed to auto cherry pick PR 4681 to branch release-v0.9 #4682

github-actions bot opened this issue Feb 24, 2025 · 0 comments
Assignees

Comments

@github-actions
Copy link
Contributor

commits 0d62811 conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #4681 , action https://github.com/spidernet-io/spiderpool/actions/runs/13493002697

Auto-merging .github/workflows/auto-upgrade-ci.yaml
Auto-merging .github/workflows/auto-version-release.yaml
Auto-merging .github/workflows/build-image-base.yaml
CONFLICT (content): Merge conflict in .github/workflows/build-image-base.yaml
Auto-merging .github/workflows/build-image-ci.yaml
CONFLICT (content): Merge conflict in .github/workflows/build-image-ci.yaml
Auto-merging .github/workflows/build-image-plugins.yaml
CONFLICT (content): Merge conflict in .github/workflows/build-image-plugins.yaml
Auto-merging .github/workflows/call-release-chart.yaml
Auto-merging .github/workflows/call-release-doc.yaml
CONFLICT (content): Merge conflict in .github/workflows/call-release-doc.yaml
Auto-merging .github/workflows/call-release-image.yaml
CONFLICT (content): Merge conflict in .github/workflows/call-release-image.yaml
Auto-merging .github/workflows/call-update-githubpages.yaml
Auto-merging .github/workflows/e2e-init.yaml
CONFLICT (content): Merge conflict in .github/workflows/e2e-init.yaml
Auto-merging .github/workflows/lint-golang.yaml
Auto-merging cmd/spiderpool/cmd/command_add.go
error: could not apply 0d6281101... Ensure kernel sends GARPs to avoid communication failures (#4681)
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 set 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

2 participants