Applying: add v1 pdb
warning: Cannot merge binary files: operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz (HEAD vs. add v1 pdb)
Using index info to reconstruct a base tree...
M	manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
M	operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
M	operator/pkg/helmreconciler/prune.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/helmreconciler/prune.go
CONFLICT (content): Merge conflict in operator/pkg/helmreconciler/prune.go
Auto-merging operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
CONFLICT (content): Merge conflict in operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
Auto-merging manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add v1 pdb
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".