Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.23] Fix tcpdump ports #15633

Open
istio-testing opened this issue Aug 30, 2024 · 0 comments
Open

[release-1.23] Fix tcpdump ports #15633

istio-testing opened this issue Aug 30, 2024 · 0 comments
Assignees

Comments

@istio-testing
Copy link
Contributor

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".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants