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
CONFLICT (modify/delete): docs/usage/install/upgrade-zh_CN.md deleted in HEAD and modified in a5a29e14 (Merge pull request #3778 from ty-dc/fix/error-gc). Version a5a29e14 (Merge pull request #3778 from ty-dc/fix/error-gc) of docs/usage/install/upgrade-zh_CN.md left in tree.
Auto-merging docs/usage/install/upgrade.md
CONFLICT (content): Merge conflict in docs/usage/install/upgrade.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging pkg/gcmanager/pod_cache.go
Auto-merging pkg/workloadendpointmanager/workloadendpoint_manager.go
CONFLICT (content): Merge conflict in pkg/workloadendpointmanager/workloadendpoint_manager.go
Auto-merging pkg/workloadendpointmanager/workloadendpoint_manager_test.go
CONFLICT (content): Merge conflict in pkg/workloadendpointmanager/workloadendpoint_manager_test.go
Auto-merging test/doc/reclaim.md
CONFLICT (content): Merge conflict in test/doc/reclaim.md
Auto-merging test/e2e/common/constant.go
Auto-merging test/e2e/common/pod.go
CONFLICT (content): Merge conflict in test/e2e/common/pod.go
Auto-merging test/e2e/common/spiderpool.go
Auto-merging test/e2e/common/tools.go
Auto-merging test/e2e/reclaim/reclaim_test.go
CONFLICT (content): Merge conflict in test/e2e/reclaim/reclaim_test.go
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
Auto-merging vendor/github.com/spidernet-io/e2eframework/framework/pod.go
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
error: could not apply a5a29e14... Merge pull request #3778 from ty-dc/fix/error-gc
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 a5a29e1 of ty-dc conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #3778 , action https://github.com/spidernet-io/spiderpool/actions/runs/10454536885
The text was updated successfully, but these errors were encountered: