| Package | Description |
|---|---|
| com.amazonaws.services.codecommit |
|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
DescribeMergeConflictsResult |
AWSCodeCommitClient.describeMergeConflicts(DescribeMergeConflictsRequest request)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
DescribeMergeConflictsResult |
AbstractAWSCodeCommit.describeMergeConflicts(DescribeMergeConflictsRequest request) |
DescribeMergeConflictsResult |
AWSCodeCommit.describeMergeConflicts(DescribeMergeConflictsRequest describeMergeConflictsRequest)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest describeMergeConflictsRequest)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
Future<DescribeMergeConflictsResult> |
AbstractAWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest request) |
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request) |
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest describeMergeConflictsRequest,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
Future<DescribeMergeConflictsResult> |
AbstractAWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest request,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler) |
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler) |
| Modifier and Type | Method and Description |
|---|---|
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest describeMergeConflictsRequest,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
Future<DescribeMergeConflictsResult> |
AbstractAWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest request,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler) |
Future<DescribeMergeConflictsResult> |
AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request,
AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler) |
| Modifier and Type | Method and Description |
|---|---|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.clone() |
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withConflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.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(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withDestinationCommitSpecifier(String destinationCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withFilePath(String filePath)
The path of the target files used to describe the conflicts.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withMaxMergeHunks(Integer maxMergeHunks)
The maximum number of merge hunks to include in the output.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withMergeOption(MergeOptionTypeEnum mergeOption)
The merge option or strategy you want to use to merge the code.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withMergeOption(String mergeOption)
The merge option or strategy you want to use to merge the code.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withNextToken(String nextToken)
An enumeration token that when provided in a request, returns the next batch of the results.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withRepositoryName(String repositoryName)
The name of the repository where you want to get information about a merge conflict.
|
DescribeMergeConflictsRequest |
DescribeMergeConflictsRequest.withSourceCommitSpecifier(String sourceCommitSpecifier)
The branch, tag, HEAD, or other fully qualified reference used to identify a commit.
|
Copyright © 2019. All rights reserved.