You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Auto-merging .github/workflows/trivy-scan-image.yaml
CONFLICT (content): Merge conflict in .github/workflows/trivy-scan-image.yaml
Auto-merging charts/spiderpool/templates/tls.yaml
Auto-merging cmd/spiderpool-controller/cmd/daemon.go
CONFLICT (content): Merge conflict in cmd/spiderpool-controller/cmd/daemon.go
CONFLICT (modify/delete): pkg/podmanager/pod_webhook.go deleted in HEAD and modified in 7fd26d87 (Merge pull request #4420 from cyclinder/controller/fix_cert). Version 7fd26d87 (Merge pull request #4420 from cyclinder/controller/fix_cert) of pkg/podmanager/pod_webhook.go left in tree.
Auto-merging pkg/podmanager/utils.go
CONFLICT (content): Merge conflict in pkg/podmanager/utils.go
Auto-merging pkg/podmanager/utils_test.go
CONFLICT (content): Merge conflict in pkg/podmanager/utils_test.go
error: could not apply 7fd26d87... Merge pull request #4420 from cyclinder/controller/fix_cert
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"
The text was updated successfully, but these errors were encountered:
commits 7fd26d8 of cyclinder conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #4420 , action https://github.com/spidernet-io/spiderpool/actions/runs/12510783461
The text was updated successfully, but these errors were encountered: