Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
A	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
CONFLICT (modify/delete): pilot/pkg/model/endpointshards.go deleted in HEAD and modified in Disable full push on scale from 1->0->1. Version Disable full push on scale from 1->0->1 of pilot/pkg/model/endpointshards.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Disable full push on scale from 1->0->1
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".