Applying: Revert "Additional changes for istioctl analyzer when checking envoyFilter patch operations (#38389)"
.git/rebase-apply/patch:1266: trailing whitespace.
   
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/config/analysis/analyzers/analyzers_test.go
M	pkg/config/analysis/analyzers/testdata/envoy-filter-merge-operation.yaml
M	pkg/config/analysis/analyzers/testdata/envoy-filter-replace-operation.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/config/analysis/analyzers/testdata/envoy-filter-replace-operation.yaml deleted in Revert "Additional changes for istioctl analyzer when checking envoyFilter patch operations (#38389)" and modified in HEAD. Version HEAD of pkg/config/analysis/analyzers/testdata/envoy-filter-replace-operation.yaml left in tree.
Removing pkg/config/analysis/analyzers/testdata/envoy-filter-remove-operation.yaml
Removing pkg/config/analysis/analyzers/testdata/envoy-filter-patch-operation.yaml
CONFLICT (modify/delete): pkg/config/analysis/analyzers/testdata/envoy-filter-merge-operation.yaml deleted in Revert "Additional changes for istioctl analyzer when checking envoyFilter patch operations (#38389)" and modified in HEAD. Version HEAD of pkg/config/analysis/analyzers/testdata/envoy-filter-merge-operation.yaml left in tree.
Removing pkg/config/analysis/analyzers/testdata/envoy-filter-add-operation.yaml
Auto-merging pkg/config/analysis/analyzers/analyzers_test.go
CONFLICT (content): Merge conflict in pkg/config/analysis/analyzers/analyzers_test.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 Revert "Additional changes for istioctl analyzer when checking envoyFilter patch operations (#38389)"
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".