Applying: Initial changes to reach label selector from mesh config to update endpoints
Using index info to reconstruct a base tree...
M	manifests/charts/base/files/profile-ambient.yaml
M	manifests/charts/default/files/profile-ambient.yaml
M	manifests/charts/gateway/files/profile-ambient.yaml
M	manifests/charts/gateways/istio-egress/files/profile-ambient.yaml
M	manifests/charts/gateways/istio-ingress/files/profile-ambient.yaml
M	manifests/charts/istio-cni/files/profile-ambient.yaml
M	manifests/charts/istio-control/istio-discovery/files/profile-ambient.yaml
M	manifests/charts/ztunnel/files/profile-ambient.yaml
M	manifests/helm-profiles/ambient.yaml
M	pilot/pkg/model/service.go
M	pilot/pkg/model/service_test.go
M	pilot/pkg/networking/core/listener_waypoint.go
M	pilot/pkg/networking/core/waypoint.go
M	pilot/pkg/serviceregistry/kube/controller/ambient/ambientindex.go
M	pilot/pkg/serviceregistry/kube/controller/ambient/multicluster.go
M	pilot/pkg/serviceregistry/kube/controller/ambient/remotesecrets.go
M	pilot/pkg/serviceregistry/kube/controller/ambient/services.go
M	pilot/pkg/serviceregistry/kube/controller/ambient/services_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/serviceregistry/kube/controller/ambient/services_test.go
CONFLICT (content): Merge conflict in pilot/pkg/serviceregistry/kube/controller/ambient/services_test.go
Auto-merging pilot/pkg/serviceregistry/kube/controller/ambient/services.go
CONFLICT (content): Merge conflict in pilot/pkg/serviceregistry/kube/controller/ambient/services.go
Auto-merging pilot/pkg/serviceregistry/kube/controller/ambient/remotesecrets.go
Auto-merging pilot/pkg/serviceregistry/kube/controller/ambient/ambientindex.go
CONFLICT (content): Merge conflict in pilot/pkg/serviceregistry/kube/controller/ambient/ambientindex.go
Auto-merging pilot/pkg/networking/core/waypoint.go
Auto-merging pilot/pkg/networking/core/listener_waypoint.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/listener_waypoint.go
Auto-merging pilot/pkg/model/service_test.go
CONFLICT (content): Merge conflict in pilot/pkg/model/service_test.go
Auto-merging pilot/pkg/model/service.go
CONFLICT (content): Merge conflict in pilot/pkg/model/service.go
Auto-merging manifests/helm-profiles/ambient.yaml
CONFLICT (content): Merge conflict in manifests/helm-profiles/ambient.yaml
Auto-merging manifests/charts/ztunnel/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/ztunnel/files/profile-ambient.yaml
Auto-merging manifests/charts/istio-control/istio-discovery/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-control/istio-discovery/files/profile-ambient.yaml
Auto-merging manifests/charts/istio-cni/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/files/profile-ambient.yaml
Auto-merging manifests/charts/gateways/istio-ingress/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-ingress/files/profile-ambient.yaml
Auto-merging manifests/charts/gateways/istio-egress/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateways/istio-egress/files/profile-ambient.yaml
Auto-merging manifests/charts/gateway/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/gateway/files/profile-ambient.yaml
Auto-merging manifests/charts/default/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/default/files/profile-ambient.yaml
Auto-merging manifests/charts/base/files/profile-ambient.yaml
CONFLICT (content): Merge conflict in manifests/charts/base/files/profile-ambient.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Initial changes to reach label selector from mesh config to update endpoints