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 4285 from ty-dc, to branch release-v1.0 #4313

Closed
weizhoublue opened this issue Nov 25, 2024 · 0 comments
Closed

failed to cherry pick PR 4285 from ty-dc, to branch release-v1.0 #4313

weizhoublue opened this issue Nov 25, 2024 · 0 comments
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 4acc850 of ty-dc conflict when merging to branch release-v1.0, please manually cherry pick it by yourself.
PR #4285 , action https://github.com/spidernet-io/spiderpool/actions/runs/12009894814

Auto-merging .github/workflows/build-image-ci.yaml
Auto-merging .github/workflows/e2e-init.yaml
CONFLICT (content): Merge conflict in .github/workflows/e2e-init.yaml
Auto-merging Makefile
error: could not apply 4acc8504f... Merge pull request #4285 from ty-dc/fix/trivy-db
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

2 participants