| Package | Description |
|---|---|
| software.amazon.awssdk.services.codecommit |
|
| software.amazon.awssdk.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
default MergeBranchesByThreeWayResponse |
CodeCommitClient.mergeBranchesByThreeWay(Consumer<MergeBranchesByThreeWayRequest.Builder> mergeBranchesByThreeWayRequest)
Merges two specified branches using the three-way merge strategy.
|
default CompletableFuture<MergeBranchesByThreeWayResponse> |
CodeCommitAsyncClient.mergeBranchesByThreeWay(Consumer<MergeBranchesByThreeWayRequest.Builder> mergeBranchesByThreeWayRequest)
Merges two specified branches using the three-way merge strategy.
|
| Modifier and Type | Method and Description |
|---|---|
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.authorName(String authorName)
The name of the author who created the commit.
|
static MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.builder() |
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.commitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
|
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.conflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use.
|
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.conflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
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.
|
default MergeBranchesByThreeWayRequest.Builder |
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 |
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 |
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 |
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 |
MergeBranchesByThreeWayRequest.Builder.email(String email)
The email address of the person merging the branches.
|
MergeBranchesByThreeWayRequest.Builder |
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 |
MergeBranchesByThreeWayRequest.Builder.overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) |
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) |
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.Builder.repositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
|
MergeBranchesByThreeWayRequest.Builder |
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 |
MergeBranchesByThreeWayRequest.Builder.targetBranch(String targetBranch)
The branch where the merge is applied.
|
MergeBranchesByThreeWayRequest.Builder |
MergeBranchesByThreeWayRequest.toBuilder() |
| Modifier and Type | Method and Description |
|---|---|
static Class<? extends MergeBranchesByThreeWayRequest.Builder> |
MergeBranchesByThreeWayRequest.serializableBuilderClass() |
Copyright © 2022. All rights reserved.