| Package | Description |
|---|---|
| com.amazonaws.services.codecommit |
|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
GetMergeConflictsResult |
AWSCodeCommitClient.getMergeConflicts(GetMergeConflictsRequest request)
Returns information about merge conflicts between the before and after commit IDs for a pull request in a
repository.
|
GetMergeConflictsResult |
AWSCodeCommit.getMergeConflicts(GetMergeConflictsRequest getMergeConflictsRequest)
Returns information about merge conflicts between the before and after commit IDs for a pull request in a
repository.
|
GetMergeConflictsResult |
AbstractAWSCodeCommit.getMergeConflicts(GetMergeConflictsRequest request) |
| Modifier and Type | Method and Description |
|---|---|
Future<GetMergeConflictsResult> |
AbstractAWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest request,
AsyncHandler<GetMergeConflictsRequest,GetMergeConflictsResult> asyncHandler) |
Future<GetMergeConflictsResult> |
AWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest getMergeConflictsRequest,
AsyncHandler<GetMergeConflictsRequest,GetMergeConflictsResult> asyncHandler)
Returns information about merge conflicts between the before and after commit IDs for a pull request in a
repository.
|
Future<GetMergeConflictsResult> |
AWSCodeCommitAsyncClient.getMergeConflictsAsync(GetMergeConflictsRequest request,
AsyncHandler<GetMergeConflictsRequest,GetMergeConflictsResult> asyncHandler) |
| Modifier and Type | Method and Description |
|---|---|
GetMergeConflictsResult |
GetMergeConflictsResult.clone() |
GetMergeConflictsResult |
GetMergeConflictsResult.withBaseCommitId(String baseCommitId)
The commit ID of the merge base.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withConflictMetadataList(Collection<ConflictMetadata> conflictMetadataList)
A list of metadata for any conflicting files.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withConflictMetadataList(ConflictMetadata... conflictMetadataList)
A list of metadata for any conflicting files.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withDestinationCommitId(String destinationCommitId)
The commit ID of the destination commit specifier that was used in the merge evaluation.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withMergeable(Boolean mergeable)
A Boolean value that indicates whether the code is mergeable by the specified merge option.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withNextToken(String nextToken)
An enumeration token that can be used in a request to return the next batch of the results.
|
GetMergeConflictsResult |
GetMergeConflictsResult.withSourceCommitId(String sourceCommitId)
The commit ID of the source commit specifier that was used in the merge evaluation.
|
Copyright © 2020. All rights reserved.