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.

Container for the parameters to the DescribeMergeConflicts operation. Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.

Inheritance Hierarchy

System.Object
  Amazon.Runtime.AmazonWebServiceRequest
    Amazon.CodeCommit.AmazonCodeCommitRequest
      Amazon.CodeCommit.Model.DescribeMergeConflictsRequest

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

Syntax

C#
public class DescribeMergeConflictsRequest : AmazonCodeCommitRequest
         IAmazonWebServiceRequest

The DescribeMergeConflictsRequest type exposes the following members

Constructors

Properties

NameTypeDescription
Public Property ConflictDetailLevel Amazon.CodeCommit.ConflictDetailLevelTypeEnum

Gets and sets the property ConflictDetailLevel.

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

Public Property ConflictResolutionStrategy Amazon.CodeCommit.ConflictResolutionStrategyTypeEnum

Gets and sets the property ConflictResolutionStrategy.

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

Public Property DestinationCommitSpecifier System.String

Gets and sets the property DestinationCommitSpecifier.

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

Public Property FilePath System.String

Gets and sets the property FilePath.

The path of the target files used to describe the conflicts.

Public Property MaxMergeHunks System.Int32

Gets and sets the property MaxMergeHunks.

The maximum number of merge hunks to include in the output.

Public Property MergeOption Amazon.CodeCommit.MergeOptionTypeEnum

Gets and sets the property MergeOption.

The merge option or strategy you want to use to merge the code.

Public Property NextToken System.String

Gets and sets the property NextToken.

An enumeration token that, when provided in a request, returns the next batch of the results.

Public Property RepositoryName System.String

Gets and sets the property RepositoryName.

The name of the repository where you want to get information about a merge conflict.

Public Property SourceCommitSpecifier System.String

Gets and sets the property SourceCommitSpecifier.

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

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