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

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 and Description
ConflictResolution	MergeBranchesByThreeWayRequest.conflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergePullRequestByThreeWayRequest.conflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergePullRequestBySquashRequest.conflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	MergeBranchesBySquashRequest.conflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
ConflictResolution	CreateUnreferencedMergeCommitRequest.conflictResolution() A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

Methods in software.amazon.awssdk.services.codecommit.model with parameters of type ConflictResolution

Modifier and Type	Method and Description
MergeBranchesByThreeWayRequest.Builder	MergeBranchesByThreeWayRequest.Builder.conflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergePullRequestByThreeWayRequest.Builder	MergePullRequestByThreeWayRequest.Builder.conflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergePullRequestBySquashRequest.Builder	MergePullRequestBySquashRequest.Builder.conflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
MergeBranchesBySquashRequest.Builder	MergeBranchesBySquashRequest.Builder.conflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.
CreateUnreferencedMergeCommitRequest.Builder	CreateUnreferencedMergeCommitRequest.Builder.conflictResolution(ConflictResolution conflictResolution) A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.