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".