You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
#13858 failed to apply on top of branch "release-1.19":
Applying: adding Amazon EKS with Istio setup to platform-setup page
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in content/en/docs/setup/platform-setup/amazon-eks/index.md
Auto-merging content/en/docs/setup/platform-setup/amazon-eks/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 adding Amazon EKS with Istio setup to platform-setup page
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".
The text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#13858 failed to apply on top of branch "release-1.19":
The text was updated successfully, but these errors were encountered: