istio.io
istio.io copied to clipboard
[release-1.23] Fix tcpdump ports
Manual cherrypick required.
#15632 failed to apply on top of branch "release-1.23":
Applying: Fix tcpdump ports
Using index info to reconstruct a base tree...
M content/en/docs/ambient/usage/verify-mtls-enabled/index.md
A content/zh/docs/ambient/usage/verify-mtls-enabled/index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/zh/docs/ambient/usage/verify-mtls-enabled/index.md deleted in HEAD and modified in Fix tcpdump ports. Version Fix tcpdump ports of content/zh/docs/ambient/usage/verify-mtls-enabled/index.md left in tree.
Auto-merging content/en/docs/ambient/usage/verify-mtls-enabled/index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix tcpdump ports
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".