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.
This is the response object from the DescribeMergeConflicts operation.
Namespace: Amazon.CodeCommit.Model
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public class DescribeMergeConflictsResponse : AmazonWebServiceResponse
The DescribeMergeConflictsResponse type exposes the following members
Name | Description | |
---|---|---|
DescribeMergeConflictsResponse() |
Name | Type | Description | |
---|---|---|---|
BaseCommitId | System.String |
Gets and sets the property BaseCommitId. The commit ID of the merge base. |
|
ConflictMetadata | Amazon.CodeCommit.Model.ConflictMetadata |
Gets and sets the property ConflictMetadata. Contains metadata about the conflicts found in the merge. |
|
ContentLength | System.Int64 | Inherited from Amazon.Runtime.AmazonWebServiceResponse. | |
DestinationCommitId | System.String |
Gets and sets the property DestinationCommitId. The commit ID of the destination commit specifier that was used in the merge evaluation. |
|
HttpStatusCode | System.Net.HttpStatusCode | Inherited from Amazon.Runtime.AmazonWebServiceResponse. | |
MergeHunks | System.Collections.Generic.List<Amazon.CodeCommit.Model.MergeHunk> |
Gets and sets the property MergeHunks. A list of merge hunks of the differences between the files or lines. |
|
NextToken | System.String |
Gets and sets the property NextToken. An enumeration token that can be used in a request to return the next batch of the results. |
|
ResponseMetadata | Amazon.Runtime.ResponseMetadata | Inherited from Amazon.Runtime.AmazonWebServiceResponse. | |
SourceCommitId | System.String |
Gets and sets the property SourceCommitId. The commit ID of the source commit specifier that was used in the merge evaluation. |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5, 4.0, 3.5