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.

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Inheritance Hierarchy

System.Object
  Amazon.CodeCommit.Model.ConflictResolution

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

Syntax

C# 
public class ConflictResolution

The ConflictResolution type exposes the following members

Constructors

NameDescription
Public Method ConflictResolution()

Properties

NameTypeDescription
Public Property 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.

Public Property 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.

Public Property 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.

Version Information

.NET:
Supported in: 8.0 and newer, Core 3.1

.NET Standard:
Supported in: 2.0

.NET Framework:
Supported in: 4.5 and newer, 3.5