Applying: tf: fast mesh config update for Istiodless
Using index info to reconstruct a base tree...
A	pkg/test/framework/components/istio/configmap.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/test/framework/components/istio/configmap.go deleted in HEAD and modified in tf: fast mesh config update for Istiodless. Version tf: fast mesh config update for Istiodless of pkg/test/framework/components/istio/configmap.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tf: fast mesh config update for Istiodless
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".