-
Notifications
You must be signed in to change notification settings - Fork 8k
Closed
Description
Manual cherrypick required.
#40700 failed to apply on top of branch "release-1.13":
Applying: Fix sync issue in GCP platform
Using index info to reconstruct a base tree...
M pkg/bootstrap/platform/gcp.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/bootstrap/platform/gcp.go
CONFLICT (content): Merge conflict in pkg/bootstrap/platform/gcp.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 Fix sync issue in GCP platform
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".
Metadata
Metadata
Assignees
Labels
No labels