Applying: update autoscaling version to v2beta2
Applying: integrate with api repo changes
.git/rebase-apply/patch:2579: trailing whitespace.
          - object: 
.git/rebase-apply/patch:2588: trailing whitespace.
          - resource: 
.git/rebase-apply/patch:2599: trailing whitespace.
          - pods: 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
M	operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Auto-merging manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
Auto-merging go.sum
Auto-merging go.mod
Applying: address comments
Using index info to reconstruct a base tree...
M	go.sum
M	operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
Falling back to patching base and 3-way merge...
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
Auto-merging go.sum
Applying: update helm gateway
Applying: address comments, fix boolean condition
warning: Cannot merge binary files: operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz (HEAD vs. address comments, fix boolean condition)
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
M	operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.pb.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 go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 address comments, fix boolean condition
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".