Uses of Class
com.amazonaws.services.codecommit.model.DescribeMergeConflictsResult

Packages that use DescribeMergeConflictsResult

Package	Description
com.amazonaws.services.codecommit	CodeCommit
com.amazonaws.services.codecommit.model

Uses of DescribeMergeConflictsResult in com.amazonaws.services.codecommit

Methods in com.amazonaws.services.codecommit that return DescribeMergeConflictsResult

Modifier and Type	Method and Description
DescribeMergeConflictsResult	AbstractAWSCodeCommit.describeMergeConflicts(DescribeMergeConflictsRequest request)
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	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.

Methods in com.amazonaws.services.codecommit that return types with arguments of type DescribeMergeConflictsResult

Modifier and Type	Method and Description
Future<DescribeMergeConflictsResult>	AbstractAWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest request)
Future<DescribeMergeConflictsResult>	AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request)
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, AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
Future<DescribeMergeConflictsResult>	AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request, AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
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.

Method parameters in com.amazonaws.services.codecommit with type arguments of type DescribeMergeConflictsResult

Modifier and Type	Method and Description
Future<DescribeMergeConflictsResult>	AbstractAWSCodeCommitAsync.describeMergeConflictsAsync(DescribeMergeConflictsRequest request, AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
Future<DescribeMergeConflictsResult>	AWSCodeCommitAsyncClient.describeMergeConflictsAsync(DescribeMergeConflictsRequest request, AsyncHandler<DescribeMergeConflictsRequest,DescribeMergeConflictsResult> asyncHandler)
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.

Uses of DescribeMergeConflictsResult in com.amazonaws.services.codecommit.model

Methods in com.amazonaws.services.codecommit.model that return DescribeMergeConflictsResult

Modifier and Type	Method and Description
DescribeMergeConflictsResult	DescribeMergeConflictsResult.clone()
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withBaseCommitId(String baseCommitId) The commit ID of the merge base.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withConflictMetadata(ConflictMetadata conflictMetadata) Contains metadata about the conflicts found in the merge.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withDestinationCommitId(String destinationCommitId) The commit ID of the destination commit specifier that was used in the merge evaluation.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withMergeHunks(Collection<MergeHunk> mergeHunks) A list of merge hunks of the differences between the files or lines.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withMergeHunks(MergeHunk... mergeHunks) A list of merge hunks of the differences between the files or lines.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withNextToken(String nextToken) An enumeration token that can be used in a request to return the next batch of the results.
DescribeMergeConflictsResult	DescribeMergeConflictsResult.withSourceCommitId(String sourceCommitId) The commit ID of the source commit specifier that was used in the merge evaluation.