codecommit/aws.sdk.kotlin.services.codecommit.model/GetMergeConflictsRequest/Builder

Builder

Properties

var conflictDetailLevel: ConflictDetailLevelTypeEnum?

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

conflictResolutionStrategy

var conflictResolutionStrategy: ConflictResolutionStrategyTypeEnum?

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

destinationCommitSpecifier

var destinationCommitSpecifier: String?

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

maxConflictFiles

var maxConflictFiles: Int?

The maximum number of files to include in the output.

mergeOption

var mergeOption: MergeOptionTypeEnum?

The merge option or strategy you want to use to merge the code.

nextToken

var nextToken: String?

An enumeration token that, when provided in a request, returns the next batch of the results.