Mitch Connors <******@****.***> 1637152085 -0800

Nicole LiHui <******@****.***> 1682232835 +0800

apiVersion: apps/v1
kind: Deployment
metadata:
  name: conflicting-ports
  namespace: bookinfo
  labels:
    app: conflicting-ports
    version: v1
spec:
  replicas: 1
  selector:
    matchLabels:
      app: conflicting-ports
      version: v1
  template:
    metadata:
      labels:
        app: conflicting-ports
        version: v1
    spec:
      serviceAccountName: bookinfo-details

apiVersion: apps/v1
kind: Deployment
metadata:
  name: conflicting-ports
  namespace: bookinfo
  labels:
    app: conflicting-ports
    version: v1
spec:
  replicas: 1
  selector:
    matchLabels:
      app: conflicting-ports
      version: v1
  template:
    metadata:
      labels:
        app: conflicting-ports
        version: v1
    spec:
      serviceAccountName: bookinfo-details

// Higher-level method M wins over lower-level conflicting methods M.

type t1e struct {
	t1
}

type t2e struct {
	t2
}

// T3 has only M as top-level method.
type T3 struct {
	t1e
	t2e
}

// T3.M should appear as method of T3.
func (T3) M() {}

// ----------------------------------------------------------------------------
// Don't show conflicting methods M embedded via an exported and non-exported

/**
 * Determines which version of an artifact to use when there are conflicting declarations.
 *
 */
@Deprecated
public interface ConflictResolver {
    String ROLE = ConflictResolver.class.getName();

    /**
     * Determines which of the specified versions of an artifact to use when there are conflicting declarations.
     *
     * @param node1 the first artifact declaration

# The user should be able to make the command unambiguous by explicitly
# upgrading the conflicting module...

go get example.net/ambiguous@v0.2.0 example.net/ambiguous/nested/pkg@v0.1.0
go list -m all
stdout '^example.net/ambiguous/nested v0.1.0$'
stdout '^example.net/ambiguous v0.2.0$'


# ...or by explicitly NOT adding the conflicting module.

cp go.mod.orig go.mod
go mod edit -require=example.net/ambiguous@v0.1.0

# Conflicting replaces in workspace modules returns error that suggests
# overriding it in the go.work file.

! go list -m example.com/dep
stderr 'go: conflicting replacements for example.com/dep@v1.0.0:\n\t'$PWD${/}'dep1\n\t'$PWD${/}'dep2\nuse "go work edit -replace example.com/dep@v1.0.0=\[override\]" to resolve'
go work edit -replace example.com/dep@v1.0.0=./dep1
go list -m example.com/dep
stdout 'example.com/dep v1.0.0 => ./dep1'

-- foo --
-- go.work --

go mod init example.com/foo
go get example.com/split/subpkg@v1.0.0
go list -m all
stdout 'example.com/split v1.0.0'

# A 'go get' that simultaneously upgrades away conflicting package definitions is not ambiguous.
go get example.com/split/subpkg@v1.1.0

# A 'go get' without an upgrade should find the package.
rm go.mod
go mod init example.com/foo
go get example.com/split/subpkg

apiVersion: release-notes/v2
kind: bug-fix
area: traffic-management
issue:
- 31833
releaseNotes:
- |