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
#737 failed to apply on top of branch "release-0.4":
Applying: fix depolying ns and service waypoint in mixed manner and add related e2e test case
Using index info to reconstruct a base tree...
M pkg/controller/workload/workload_processor.go
M test/e2e/baseline_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/baseline_test.go
CONFLICT (content): Merge conflict in test/e2e/baseline_test.go
Auto-merging pkg/controller/workload/workload_processor.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 depolying ns and service waypoint in mixed manner and add related e2e test case
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:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.
Manual cherrypick required.
#737 failed to apply on top of branch "release-0.4":
The text was updated successfully, but these errors were encountered: