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 one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.
For .NET Core this operation is only available in asynchronous form. Please refer to DescribeMergeConflictsAsync.
Namespace: Amazon.CodeCommit
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public abstract DescribeMergeConflictsResponse DescribeMergeConflicts( DescribeMergeConflictsRequest request )
Container for the necessary parameters to execute the DescribeMergeConflicts service method.
| 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. |
| FileDoesNotExistException | The specified file does not exist. Verify that you have used the correct file name, full path, and extension. |
| 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. |
| InvalidMaxMergeHunksException | The specified value for the number of merge hunks 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. |
| InvalidPathException | The specified path is not valid. |
| 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. |
| 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. |
| PathRequiredException | The folderPath for a location cannot be null. |
| 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 Framework:
Supported in: 4.5, 4.0, 3.5