Auto-merging .github/workflows/auto-upgrade-ci.yaml
Auto-merging test/Makefile
Auto-merging test/e2e/annotation/annotation_test.go
CONFLICT (content): Merge conflict in test/e2e/annotation/annotation_test.go
Auto-merging test/scripts/debugEnv.sh
CONFLICT (content): Merge conflict in test/scripts/debugEnv.sh
error: could not apply 1d2e1c81... Merge pull request #3526 from ty-dc/debug-upgrade-x
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"
ty-dc
commented
1 week ago
commits 1d2e1c81093a33d92c2f0e5ea65f7cfdee714f41 of ty-dc conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/3526 , action https://github.com/spidernet-io/spiderpool/actions/runs/9541331074