AWS services or capabilities described in AWS Documentation may vary by region/location. Click Getting Started with Amazon AWS to see specific differences applicable to the China (Beijing) Region.
Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.
This is an asynchronous operation using the standard naming convention for .NET 4.5 or higher. For .NET 3.5 the operation is implemented as a pair of methods using the standard naming convention of BeginGetMergeConflicts and EndGetMergeConflicts.
Namespace: Amazon.CodeCommit
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public abstract Task<GetMergeConflictsResponse> GetMergeConflictsAsync( GetMergeConflictsRequest request, CancellationToken cancellationToken )
Container for the necessary parameters to execute the GetMergeConflicts service method.
A cancellation token that can be used by other objects or threads to receive notice of cancellation.
| Exception | Condition |
|---|---|
| CommitDoesNotExistException | The specified commit does not exist or no commit was specified, and the specified repository has no default branch. |
| CommitRequiredException | A commit was not specified. |
| EncryptionIntegrityChecksFailedException | An encryption integrity check failed. |
| EncryptionKeyAccessDeniedException | An encryption key could not be accessed. |
| EncryptionKeyDisabledException | The encryption key is disabled. |
| EncryptionKeyNotFoundException | No encryption key was found. |
| EncryptionKeyUnavailableException | The encryption key is not available. |
| InvalidCommitException | The specified commit is not valid. |
| InvalidConflictDetailLevelException | The specified conflict detail level is not valid. |
| InvalidConflictResolutionStrategyException | The specified conflict resolution strategy is not valid. |
| InvalidContinuationTokenException | The specified continuation token is not valid. |
| InvalidDestinationCommitSpecifierException | The destination commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID. |
| InvalidMaxConflictFilesException | The specified value for the number of conflict files to return is not valid. |
| InvalidMergeOptionException | The specified merge option is not valid for this operation. Not all merge strategies are supported for all operations. |
| InvalidRepositoryNameException | A specified repository name is not valid. This exception occurs only when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist. |
| InvalidSourceCommitSpecifierException | The source commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID. |
| MaximumFileContentToLoadExceededException | The number of files to load exceeds the allowed limit. |
| MaximumItemsToCompareExceededException | The number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed. |
| MergeOptionRequiredException | A merge option or stategy is required, and none was provided. |
| RepositoryDoesNotExistException | The specified repository does not exist. |
| RepositoryNameRequiredException | A repository name is required, but was not specified. |
| TipsDivergenceExceededException | The divergence between the tips of the provided commit specifiers is too great to determine whether there might be any merge conflicts. Locally compare the specifiers using git diff or a diff tool. |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5