| Package | Description |
|---|---|
| com.amazonaws.services.codecommit |
|
| com.amazonaws.services.codecommit.model |
| Modifier and Type | Method and Description |
|---|---|
BatchDescribeMergeConflictsResult |
AWSCodeCommit.batchDescribeMergeConflicts(BatchDescribeMergeConflictsRequest batchDescribeMergeConflictsRequest)
Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the
squash or three-way merge strategy.
|
BatchDescribeMergeConflictsResult |
AbstractAWSCodeCommit.batchDescribeMergeConflicts(BatchDescribeMergeConflictsRequest request) |
BatchDescribeMergeConflictsResult |
AWSCodeCommitClient.batchDescribeMergeConflicts(BatchDescribeMergeConflictsRequest 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.
|
| Modifier and Type | Method and Description |
|---|---|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.clone() |
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withBaseCommitId(String baseCommitId)
The commit ID of the merge base.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withConflicts(Collection<Conflict> conflicts)
A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the
files.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withConflicts(Conflict... conflicts)
A list of conflicts for each file, including the conflict metadata and the hunks of the differences between the
files.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withDestinationCommitId(String destinationCommitId)
The commit ID of the destination commit specifier that was used in the merge evaluation.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withErrors(BatchDescribeMergeConflictsError... errors)
A list of any errors returned while describing the merge conflicts for each file.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withErrors(Collection<BatchDescribeMergeConflictsError> errors)
A list of any errors returned while describing the merge conflicts for each file.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withNextToken(String nextToken)
An enumeration token that can be used in a request to return the next batch of the results.
|
BatchDescribeMergeConflictsResult |
BatchDescribeMergeConflictsResult.withSourceCommitId(String sourceCommitId)
The commit ID of the source commit specifier that was used in the merge evaluation.
|
Copyright © 2021. All rights reserved.