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.
Information about conflicts in a merge operation.
Namespace: Amazon.CodeCommit.Model
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public class Conflict
The Conflict type exposes the following members
Name | Description | |
---|---|---|
Conflict() |
Name | Type | Description | |
---|---|---|---|
ConflictMetadata | Amazon.CodeCommit.Model.ConflictMetadata |
Gets and sets the property ConflictMetadata. Metadata about a conflict in a merge operation. |
|
MergeHunks | System.Collections.Generic.List<Amazon.CodeCommit.Model.MergeHunk> |
Gets and sets the property MergeHunks. A list of hunks that contain the differences between files or lines causing the conflict. |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5, 4.0, 3.5