Skip to content

failed to cherry pick PR 4752 from cyclinder, to branch release-v0.8 #4758

Open
@weizhoublue

Description

@weizhoublue

commits 1b4f7cf of cyclinder conflict when merging to branch release-v0.8, please manually cherry pick it by yourself.
PR #4752 , action https://github.com/spidernet-io/spiderpool/actions/runs/14106791377

Auto-merging pkg/gcmanager/pod_cache.go
CONFLICT (content): Merge conflict in pkg/gcmanager/pod_cache.go
Auto-merging pkg/gcmanager/scanAll_IPPool.go
CONFLICT (content): Merge conflict in pkg/gcmanager/scanAll_IPPool.go
error: could not apply 1b4f7cf8e... Merge pull request #4752 from cyclinder/ipam/disable_gc_ternamating
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 set advice.mergeConflict false"

Metadata

Metadata

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions