Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

failed to cherry pick PR 3778 from ty-dc, to branch release-v0.8 #3900

Closed
weizhoublue opened this issue Aug 19, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants