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.

Information about conflicts in a merge operation.

Inheritance Hierarchy

System.Object
  Amazon.CodeCommit.Model.Conflict

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

Syntax

C#
public class Conflict

The Conflict type exposes the following members

Constructors

NameDescription
Public Method Conflict()

Properties

NameTypeDescription
Public Property ConflictMetadata Amazon.CodeCommit.Model.ConflictMetadata

Gets and sets the property ConflictMetadata.

Metadata about a conflict in a merge operation.

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

Version Information

.NET Core App:
Supported in: 3.1

.NET Standard:
Supported in: 2.0

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