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.
If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
Namespace: Amazon.CodeCommit.Model
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public class ConflictResolution
The ConflictResolution type exposes the following members
Name | Description | |
---|---|---|
ConflictResolution() |
Name | Type | Description | |
---|---|---|---|
DeleteFiles | System.Collections.Generic.List<Amazon.CodeCommit.Model.DeleteFileEntry> |
Gets and sets the property DeleteFiles. Files to be deleted as part of the merge conflict resolution. |
|
ReplaceContents | System.Collections.Generic.List<Amazon.CodeCommit.Model.ReplaceContentEntry> |
Gets and sets the property ReplaceContents. Files to have content replaced as part of the merge conflict resolution. |
|
SetFileModes | System.Collections.Generic.List<Amazon.CodeCommit.Model.SetFileModeEntry> |
Gets and sets the property SetFileModes. File modes that are set as part of the merge conflict resolution. |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5, 4.0, 3.5