istio.io icon indicating copy to clipboard operation
istio.io copied to clipboard

[release-1.23] #15583 typo/nit followup

Open istio-testing opened this issue 1 year ago • 0 comments

Manual cherrypick required.

#15619 failed to apply on top of branch "release-1.23":

Applying: typo/nits
Using index info to reconstruct a base tree...
A	content/en/docs/ambient/usage/networkpolicy/index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/en/docs/ambient/usage/networkpolicy/index.md deleted in HEAD and modified in typo/nits. Version typo/nits of content/en/docs/ambient/usage/networkpolicy/index.md 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 typo/nits
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".

istio-testing avatar Aug 27 '24 17:08 istio-testing