Applying: added the ability to read tls type secrets
Using index info to reconstruct a base tree...
M	pilot/pkg/bootstrap/certcontroller.go
M	pilot/pkg/bootstrap/istio_ca.go
M	security/pkg/pki/ca/ca.go
M	security/pkg/pki/util/keycertbundle.go
Falling back to patching base and 3-way merge...
Auto-merging security/pkg/pki/util/keycertbundle.go
CONFLICT (content): Merge conflict in security/pkg/pki/util/keycertbundle.go
Auto-merging security/pkg/pki/ca/ca.go
CONFLICT (content): Merge conflict in security/pkg/pki/ca/ca.go
Auto-merging pilot/pkg/bootstrap/istio_ca.go
Auto-merging pilot/pkg/bootstrap/certcontroller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 added the ability to read tls type secrets
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".