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
Auto-merging test/Makefile
CONFLICT (content): Merge conflict in test/Makefile
Auto-merging test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go
error: could not apply cfae10b8... Merge pull request #3758 from cyclinder/charts/multus_uninstall
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 cfae10b of cyclinder conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #3758 , action https://github.com/spidernet-io/spiderpool/actions/runs/10175239550
The text was updated successfully, but these errors were encountered: