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
#51429 failed to apply on top of branch "release-1.22":
Applying: Skip pods with duplicate IPs when adding to host probe exclusion set
Using index info to reconstruct a base tree...
M cni/pkg/nodeagent/net.go
M cni/pkg/nodeagent/net_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/nodeagent/net_test.go
Auto-merging cni/pkg/nodeagent/net.go
Applying: Lint
Applying: Relnote
Applying: Actually exclude terminated job pods
Applying: Shorten log
Applying: Derp
Applying: More robust checks
Applying: Use old pod
Applying: Test
Applying: More test
Applying: Lints
Applying: Smarter IP add
Using index info to reconstruct a base tree...
M cni/pkg/nodeagent/net.go
M cni/pkg/nodeagent/net_test.go
Falling back to patching base and 3-way merge...
Auto-merging cni/pkg/nodeagent/net_test.go
CONFLICT (content): Merge conflict in cni/pkg/nodeagent/net_test.go
Auto-merging cni/pkg/nodeagent/net.go
CONFLICT (content): Merge conflict in cni/pkg/nodeagent/net.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 Smarter IP add
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
The text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#51429 failed to apply on top of branch "release-1.22":
The text was updated successfully, but these errors were encountered: