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

[release-1.23] Add more detail to the EKS workaround

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

Manual cherrypick required.

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

Applying: Add more detail to the EKS workaround
Using index info to reconstruct a base tree...
M	content/en/docs/ambient/install/platform-prerequisites/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/ambient/install/platform-prerequisites/index.md
CONFLICT (content): Merge conflict in content/en/docs/ambient/install/platform-prerequisites/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 Add more detail to the EKS workaround
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 Oct 11 '24 19:10 istio-testing