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
#2799 failed to apply on top of branch "release-1.18":
Applying: wasm: add fail_open for telemetry plugins
Using index info to reconstruct a base tree...
M extensions/v1alpha1/wasm.pb.go
M extensions/v1alpha1/wasm.pb.html
M extensions/v1alpha1/wasm.proto
M kubernetes/customresourcedefinitions.gen.yaml
M proto.lock
Falling back to patching base and 3-way merge...
Auto-merging proto.lock
Auto-merging kubernetes/customresourcedefinitions.gen.yaml
Auto-merging extensions/v1alpha1/wasm.proto
Auto-merging extensions/v1alpha1/wasm.pb.html
Auto-merging extensions/v1alpha1/wasm.pb.go
CONFLICT (content): Merge conflict in extensions/v1alpha1/wasm.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 wasm: add fail_open for telemetry plugins
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.
#2799 failed to apply on top of branch "release-1.18":
The text was updated successfully, but these errors were encountered: