Applying: unify timeout logic across service and virtual service
Using index info to reconstruct a base tree...
M	pilot/pkg/networking/core/v1alpha3/route/route.go
M	pilot/pkg/networking/core/v1alpha3/route/route_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/networking/core/v1alpha3/route/route_test.go
Auto-merging pilot/pkg/networking/core/v1alpha3/route/route.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/route/route.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 unify timeout logic across service and virtual service
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".