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 test/e2e/ippoolcr/ippoolcr_test.go
CONFLICT (content): Merge conflict in test/e2e/ippoolcr/ippoolcr_test.go
error: could not apply df74686d... Merge pull request #3011 from Icarus9913/fix/wk/pool-inherit
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".
The text was updated successfully, but these errors were encountered:
commits df74686 of Icarus9913 conflict when merging to branch release-v0.7, please manually cherry pick it by yourself.
PR #3011 , action https://github.com/spidernet-io/spiderpool/actions/runs/7328889918
The text was updated successfully, but these errors were encountered: