Uses of Class software.amazon.awssdk.services.codecommit.model.ConflictResolution (AWS Java SDK :: Services :: AWS CodeCommit 2.23.3 API)

Packages that use ConflictResolution
Package Description

software.amazon.awssdk.services.codecommit.model

Uses of ConflictResolution in software.amazon.awssdk.services.codecommit.model

Methods in software.amazon.awssdk.services.codecommit.model that return ConflictResolution
Modifier and Type	Method	Description
`ConflictResolution`	CreateUnreferencedMergeCommitRequest.`conflictResolution()`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`ConflictResolution`	MergeBranchesBySquashRequest.`conflictResolution()`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`ConflictResolution`	MergeBranchesByThreeWayRequest.`conflictResolution()`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`ConflictResolution`	MergePullRequestBySquashRequest.`conflictResolution()`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`ConflictResolution`	MergePullRequestByThreeWayRequest.`conflictResolution()`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Methods in software.amazon.awssdk.services.codecommit.model with parameters of type ConflictResolution
Modifier and Type	Method	Description
`CreateUnreferencedMergeCommitRequest.Builder`	CreateUnreferencedMergeCommitRequest.Builder.`conflictResolution(ConflictResolution conflictResolution)`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`MergeBranchesBySquashRequest.Builder`	MergeBranchesBySquashRequest.Builder.`conflictResolution(ConflictResolution conflictResolution)`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`MergeBranchesByThreeWayRequest.Builder`	MergeBranchesByThreeWayRequest.Builder.`conflictResolution(ConflictResolution conflictResolution)`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`MergePullRequestBySquashRequest.Builder`	MergePullRequestBySquashRequest.Builder.`conflictResolution(ConflictResolution conflictResolution)`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
`MergePullRequestByThreeWayRequest.Builder`	MergePullRequestByThreeWayRequest.Builder.`conflictResolution(ConflictResolution conflictResolution)`	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.