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.24] clarify ambient mode installation required for dns-proxy #16253

Open
istio-testing opened this issue Feb 17, 2025 · 0 comments
Open
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#16230 failed to apply on top of branch "release-1.24":

Applying: clarify ambient mode installation required for dns-proxy
Applying: presumptious changes
Using index info to reconstruct a base tree...
M	content/en/docs/ops/configuration/traffic-management/dns-proxy/index.md
M	content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh
M	content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh
CONFLICT (content): Merge conflict in content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh
Auto-merging content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh
CONFLICT (content): Merge conflict in content/en/docs/ops/configuration/traffic-management/dns-proxy/snips.sh
Auto-merging content/en/docs/ops/configuration/traffic-management/dns-proxy/index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 presumptious changes

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