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
#15196 failed to apply on top of branch "release-1.22":
Applying: istio 1.20 performance result
Using index info to reconstruct a base tree...
M content/en/docs/ops/deployment/performance-and-scalability/index.md
A content/en/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg
A content/en/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg
Falling back to patching base and 3-way merge...
Auto-merging content/en/docs/ops/deployment/performance-and-scalability/index.md
CONFLICT (content): Merge conflict in content/en/docs/ops/deployment/performance-and-scalability/index.md
CONFLICT (rename/delete): content/en/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg deleted in istio 1.20 performance result and renamed to archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg in HEAD. Version HEAD of archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p99_fortio_with_jitter.svg left in tree.
CONFLICT (rename/delete): content/en/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg deleted in istio 1.20 performance result and renamed to archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg in HEAD. Version HEAD of archive/v1.19/docs/ops/deployment/performance-and-scalability/latency_p90_fortio_with_jitter.svg left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 istio 1.20 performance result
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.
#15196 failed to apply on top of branch "release-1.22":
The text was updated successfully, but these errors were encountered: