software.amazon.awssdk.services.codecommit.model

Interface MergeBranchesByThreeWayRequest.Builder

All Superinterfaces:

AwsRequest.Builder, Buildable, CodeCommitRequest.Builder, CopyableBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>, SdkBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>, SdkPojo, SdkRequest.Builder

Enclosing class:

MergeBranchesByThreeWayRequest

public static interface MergeBranchesByThreeWayRequest.Builder
extends CodeCommitRequest.Builder, SdkPojo, CopyableBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>

Method Summary

Modifier and Type	Method and Description
MergeBranchesByThreeWayRequest.Builder	authorName(String authorName) The name of the author who created the commit.
MergeBranchesByThreeWayRequest.Builder	commitMessage(String commitMessage) The commit message to include in the commit information for the merge.
MergeBranchesByThreeWayRequest.Builder	conflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel) The level of conflict detail to use.
MergeBranchesByThreeWayRequest.Builder	conflictDetailLevel(String conflictDetailLevel) The level of conflict detail to use.
MergeBranchesByThreeWayRequest.Builder	conflictResolution(ConflictResolution conflictResolution) If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
default MergeBranchesByThreeWayRequest.Builder	conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution) If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
MergeBranchesByThreeWayRequest.Builder	conflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
MergeBranchesByThreeWayRequest.Builder	conflictResolutionStrategy(String conflictResolutionStrategy) Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
MergeBranchesByThreeWayRequest.Builder	destinationCommitSpecifier(String destinationCommitSpecifier) The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
MergeBranchesByThreeWayRequest.Builder	email(String email) The email address of the person merging the branches.
MergeBranchesByThreeWayRequest.Builder	keepEmptyFolders(Boolean keepEmptyFolders) If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.
MergeBranchesByThreeWayRequest.Builder	overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration)
MergeBranchesByThreeWayRequest.Builder	overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer)
MergeBranchesByThreeWayRequest.Builder	repositoryName(String repositoryName) The name of the repository where you want to merge two branches.
MergeBranchesByThreeWayRequest.Builder	sourceCommitSpecifier(String sourceCommitSpecifier) The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
MergeBranchesByThreeWayRequest.Builder	targetBranch(String targetBranch) The branch where the merge is applied.

Methods inherited from interface software.amazon.awssdk.services.codecommit.model.CodeCommitRequest.Builder

build

Methods inherited from interface software.amazon.awssdk.awscore.AwsRequest.Builder

overrideConfiguration

Methods inherited from interface software.amazon.awssdk.core.SdkPojo

equalsBySdkFields, sdkFields

Methods inherited from interface software.amazon.awssdk.utils.builder.CopyableBuilder

copy

Methods inherited from interface software.amazon.awssdk.utils.builder.SdkBuilder

applyMutation, build

Method Detail

repositoryName

MergeBranchesByThreeWayRequest.Builder repositoryName(String repositoryName)

The name of the repository where you want to merge two branches.

Parameters:

repositoryName - The name of the repository where you want to merge two branches.

Returns:

Returns a reference to this object so that method calls can be chained together.

sourceCommitSpecifier

MergeBranchesByThreeWayRequest.Builder sourceCommitSpecifier(String sourceCommitSpecifier)

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

Parameters:

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

Returns:

Returns a reference to this object so that method calls can be chained together.

destinationCommitSpecifier

MergeBranchesByThreeWayRequest.Builder destinationCommitSpecifier(String destinationCommitSpecifier)

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

Parameters:

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

Returns:

Returns a reference to this object so that method calls can be chained together.

targetBranch

MergeBranchesByThreeWayRequest.Builder targetBranch(String targetBranch)

The branch where the merge is applied.

Parameters:

targetBranch - The branch where the merge is applied.

Returns:

Returns a reference to this object so that method calls can be chained together.

conflictDetailLevel

MergeBranchesByThreeWayRequest.Builder conflictDetailLevel(String conflictDetailLevel)

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.

Parameters:

conflictDetailLevel - 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.

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

ConflictDetailLevelTypeEnum, ConflictDetailLevelTypeEnum

conflictDetailLevel

MergeBranchesByThreeWayRequest.Builder conflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)

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.

Parameters:

conflictDetailLevel - 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.

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

ConflictDetailLevelTypeEnum, ConflictDetailLevelTypeEnum

conflictResolutionStrategy

MergeBranchesByThreeWayRequest.Builder conflictResolutionStrategy(String conflictResolutionStrategy)

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.

Parameters:

conflictResolutionStrategy - 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.

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

ConflictResolutionStrategyTypeEnum, ConflictResolutionStrategyTypeEnum

conflictResolutionStrategy

MergeBranchesByThreeWayRequest.Builder conflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy)

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.

Parameters:

conflictResolutionStrategy - 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.

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

ConflictResolutionStrategyTypeEnum, ConflictResolutionStrategyTypeEnum

authorName

MergeBranchesByThreeWayRequest.Builder authorName(String authorName)

The name of the author who created the commit. This information is used as both the author and committer for the commit.

Parameters:

authorName - The name of the author who created the commit. This information is used as both the author and committer for the commit.

Returns:

Returns a reference to this object so that method calls can be chained together.

email

MergeBranchesByThreeWayRequest.Builder email(String email)

The email address of the person merging the branches. This information is used in the commit information for the merge.

Parameters:

email - The email address of the person merging the branches. This information is used in the commit information for the merge.

Returns:

Returns a reference to this object so that method calls can be chained together.

commitMessage

MergeBranchesByThreeWayRequest.Builder commitMessage(String commitMessage)

The commit message to include in the commit information for the merge.

Parameters:

commitMessage - The commit message to include in the commit information for the merge.

Returns:

Returns a reference to this object so that method calls can be chained together.

keepEmptyFolders

MergeBranchesByThreeWayRequest.Builder keepEmptyFolders(Boolean keepEmptyFolders)

If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.

Parameters:

keepEmptyFolders - If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.

Returns:

Returns a reference to this object so that method calls can be chained together.

conflictResolution

MergeBranchesByThreeWayRequest.Builder conflictResolution(ConflictResolution conflictResolution)

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Parameters:

conflictResolution - If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Returns:

Returns a reference to this object so that method calls can be chained together.

conflictResolution

default MergeBranchesByThreeWayRequest.Builder conflictResolution(Consumer<ConflictResolution.Builder> conflictResolution)

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

This is a convenience that creates an instance of the ConflictResolution.Builder avoiding the need to create one manually via ConflictResolution.builder(). When the Consumer completes, SdkBuilder.build() is called immediately and its result is passed to conflictResolution(ConflictResolution).

Parameters:

conflictResolution - a consumer that will call methods on ConflictResolution.Builder

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

conflictResolution(ConflictResolution)

overrideConfiguration

MergeBranchesByThreeWayRequest.Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration)

Specified by:

overrideConfiguration in interface AwsRequest.Builder

overrideConfiguration

MergeBranchesByThreeWayRequest.Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer)

Specified by:

overrideConfiguration in interface AwsRequest.Builder