| Package | Description |
|---|---|
| com.amazonaws.services.codecommit |
|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
Future<MergeBranchesByThreeWayResult> |
AbstractAWSCodeCommitAsync.mergeBranchesByThreeWayAsync(MergeBranchesByThreeWayRequest request,
AsyncHandler<MergeBranchesByThreeWayRequest,MergeBranchesByThreeWayResult> asyncHandler) |
Future<MergeBranchesByThreeWayResult> |
AWSCodeCommitAsync.mergeBranchesByThreeWayAsync(MergeBranchesByThreeWayRequest mergeBranchesByThreeWayRequest,
AsyncHandler<MergeBranchesByThreeWayRequest,MergeBranchesByThreeWayResult> asyncHandler)
Merges two specified branches using the three-way merge strategy.
|
Future<MergeBranchesByThreeWayResult> |
AWSCodeCommitAsyncClient.mergeBranchesByThreeWayAsync(MergeBranchesByThreeWayRequest request,
AsyncHandler<MergeBranchesByThreeWayRequest,MergeBranchesByThreeWayResult> asyncHandler) |
| Modifier and Type | Method and Description |
|---|---|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.clone() |
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withAuthorName(String authorName)
The name of the author who created the commit.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withCommitMessage(String commitMessage)
The commit message to include in the commit information for the merge.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withConflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withConflictResolution(ConflictResolution conflictResolution)
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a
merge.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.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(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withDestinationCommitSpecifier(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 |
MergeBranchesByThreeWayRequest.withEmail(String email)
The email address of the person merging the branches.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withKeepEmptyFolders(Boolean keepEmptyFolders)
If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders
empty.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withRepositoryName(String repositoryName)
The name of the repository where you want to merge two branches.
|
MergeBranchesByThreeWayRequest |
MergeBranchesByThreeWayRequest.withSourceCommitSpecifier(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 |
MergeBranchesByThreeWayRequest.withTargetBranch(String targetBranch)
The branch where the merge is applied.
|
Copyright © 2020. All rights reserved.