Applying: Ignore port name in domain matching entirely
Using index info to reconstruct a base tree...
M	pilot/pkg/features/pilot.go
M	pilot/pkg/networking/core/v1alpha3/gateway.go
M	pilot/pkg/networking/core/v1alpha3/httproute.go
M	pilot/pkg/networking/core/v1alpha3/httproute_test.go
M	pkg/test/util/assert/assert.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
CONFLICT (add/add): Merge conflict in releasenotes/notes/ignore-port.yaml
Auto-merging releasenotes/notes/ignore-port.yaml
Auto-merging pilot/pkg/networking/core/v1alpha3/httproute_test.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/httproute_test.go
Auto-merging pilot/pkg/networking/core/v1alpha3/httproute.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/httproute.go
Auto-merging pilot/pkg/networking/core/v1alpha3/gateway.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/gateway.go
Auto-merging pilot/pkg/features/pilot.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 Ignore port name in domain matching entirely
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".