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
#51003 failed to apply on top of branch "release-1.20":
Applying: add kubernetes registry infront of serviceentry
Applying: add test
Applying: add release note
Applying: address comments
Using index info to reconstruct a base tree...
M pilot/pkg/serviceregistry/aggregate/controller.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/serviceregistry/aggregate/controller.go
CONFLICT (content): Merge conflict in pilot/pkg/serviceregistry/aggregate/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 address comments
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.
#51003 failed to apply on top of branch "release-1.20":
The text was updated successfully, but these errors were encountered: