Uses of Class
com.amazonaws.services.codecommit.model.ConflictResolutionStrategyTypeEnum

Packages that use ConflictResolutionStrategyTypeEnum

Package	Description
com.amazonaws.services.codecommit.model

Uses of ConflictResolutionStrategyTypeEnum in com.amazonaws.services.codecommit.model

Methods in com.amazonaws.services.codecommit.model that return ConflictResolutionStrategyTypeEnum

Modifier and Type	Method and Description
static ConflictResolutionStrategyTypeEnum	ConflictResolutionStrategyTypeEnum.fromValue(String value) Use this in place of valueOf.
static ConflictResolutionStrategyTypeEnum	ConflictResolutionStrategyTypeEnum.valueOf(String name) Returns the enum constant of this type with the specified name.
static ConflictResolutionStrategyTypeEnum[]	ConflictResolutionStrategyTypeEnum.values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods in com.amazonaws.services.codecommit.model with parameters of type ConflictResolutionStrategyTypeEnum

Modifier and Type	Method and Description
MergePullRequestByThreeWayRequest	MergePullRequestByThreeWayRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
MergePullRequestBySquashRequest	MergePullRequestBySquashRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
MergeBranchesByThreeWayRequest	MergeBranchesByThreeWayRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
MergeBranchesBySquashRequest	MergeBranchesBySquashRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
GetMergeOptionsRequest	GetMergeOptionsRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
GetMergeConflictsRequest	GetMergeConflictsRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
DescribeMergeConflictsRequest	DescribeMergeConflictsRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
BatchDescribeMergeConflictsRequest	BatchDescribeMergeConflictsRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
CreateUnreferencedMergeCommitRequest	CreateUnreferencedMergeCommitRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
GetMergeCommitRequest	GetMergeCommitRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.