| Package | Description |
|---|---|
| com.amazonaws.services.codecommit |
|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
GetMergeConflictsResult |
AbstractAWSCodeCommit.getMergeConflicts(GetMergeConflictsRequest request) |
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.
|
Future<GetMergeConflictsResult> |
AbstractAWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest request) |
Future<GetMergeConflictsResult> |
AWSCodeCommitAsyncClient.getMergeConflictsAsync(GetMergeConflictsRequest request) |
Future<GetMergeConflictsResult> |
AWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest getMergeConflictsRequest)
Returns information about merge conflicts between the before and after commit IDs for a pull request in a
repository.
|
Future<GetMergeConflictsResult> |
AbstractAWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest request,
AsyncHandler<GetMergeConflictsRequest,GetMergeConflictsResult> asyncHandler) |
Future<GetMergeConflictsResult> |
AWSCodeCommitAsyncClient.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.
|
| Modifier and Type | Method and Description |
|---|---|
Future<GetMergeConflictsResult> |
AbstractAWSCodeCommitAsync.getMergeConflictsAsync(GetMergeConflictsRequest request,
AsyncHandler<GetMergeConflictsRequest,GetMergeConflictsResult> asyncHandler) |
Future<GetMergeConflictsResult> |
AWSCodeCommitAsyncClient.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.
|
| Modifier and Type | Method and Description |
|---|---|
GetMergeConflictsRequest |
GetMergeConflictsRequest.clone() |
GetMergeConflictsRequest |
GetMergeConflictsRequest.withConflictDetailLevel(ConflictDetailLevelTypeEnum conflictDetailLevel)
The level of conflict detail to use.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withConflictDetailLevel(String conflictDetailLevel)
The level of conflict detail to use.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withConflictResolutionStrategy(ConflictResolutionStrategyTypeEnum conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withConflictResolutionStrategy(String conflictResolutionStrategy)
Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions
of a file.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.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).
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withMaxConflictFiles(Integer maxConflictFiles)
The maximum number of files to include in the output.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withMergeOption(MergeOptionTypeEnum mergeOption)
The merge option or strategy you want to use to merge the code.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withMergeOption(String mergeOption)
The merge option or strategy you want to use to merge the code.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withNextToken(String nextToken)
An enumeration token that, when provided in a request, returns the next batch of the results.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.withRepositoryName(String repositoryName)
The name of the repository where the pull request was created.
|
GetMergeConflictsRequest |
GetMergeConflictsRequest.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).
|
Copyright © 2023. All rights reserved.