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
#2687 failed to apply on top of branch "release-1.17":
Applying: replace quotes with backticks when referring to values
Using index info to reconstruct a base tree...
M security/v1/authorization_policy.pb.go
M security/v1/authorization_policy.pb.html
M security/v1/authorization_policy.proto
M security/v1beta1/authorization_policy.pb.go
M security/v1beta1/authorization_policy.pb.html
M security/v1beta1/authorization_policy.proto
Falling back to patching base and 3-way merge...
Auto-merging security/v1beta1/authorization_policy.proto
CONFLICT (content): Merge conflict in security/v1beta1/authorization_policy.proto
Auto-merging security/v1beta1/authorization_policy.pb.html
CONFLICT (content): Merge conflict in security/v1beta1/authorization_policy.pb.html
Auto-merging security/v1beta1/authorization_policy.pb.go
Auto-merging security/v1/authorization_policy.proto
CONFLICT (content): Merge conflict in security/v1/authorization_policy.proto
Auto-merging security/v1/authorization_policy.pb.html
CONFLICT (content): Merge conflict in security/v1/authorization_policy.pb.html
Auto-merging security/v1/authorization_policy.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 replace quotes with backticks when referring to values
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.
#2687 failed to apply on top of branch "release-1.17":
The text was updated successfully, but these errors were encountered: