AWS SDK Version 3 for .NET
API Reference

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.


For .NET Core and PCL this operation is only available in asynchronous form. Please refer to GetMergeConflictsAsync.

Namespace: Amazon.CodeCommit
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z


public abstract GetMergeConflictsResponse GetMergeConflicts(
         GetMergeConflictsRequest request
Type: Amazon.CodeCommit.Model.GetMergeConflictsRequest

Container for the necessary parameters to execute the GetMergeConflicts service method.

Return Value
The response from the GetMergeConflicts service method, as returned by CodeCommit.


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.
InvalidDestinationCommitSpecifierException The destination commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID.
InvalidMergeOptionException The specified merge option is not valid. The only valid value is FAST_FORWARD_MERGE.
InvalidRepositoryNameException At least one specified repository name is not valid. This exception only occurs 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.
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.

Version Information

.NET Framework:
Supported in: 4.5, 4.0, 3.5

Portable Class Library:
Supported in: Windows Store Apps
Supported in: Windows Phone 8.1
Supported in: Xamarin Android
Supported in: Xamarin iOS (Unified)
Supported in: Xamarin.Forms

See Also