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 charts/spiderpool/templates/daemonset.yaml
CONFLICT (content): Merge conflict in charts/spiderpool/templates/daemonset.yaml
Auto-merging pkg/podmanager/utils.go
error: could not apply b6d671ab2... Merge pull request #4322 from cyclinder/charts/fix_daemonset
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 b6d671a of cyclinder conflict when merging to branch release-v1.0, please manually cherry pick it by yourself.
PR #4322 , action https://github.com/spidernet-io/spiderpool/actions/runs/12049544093
The text was updated successfully, but these errors were encountered: