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 GetMergeConflicts operation. Returns information about merge conflicts between the before and after commit IDs for a pull request in a repository.
Namespace: Amazon.CodeCommit.Model
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public class GetMergeConflictsRequest : AmazonCodeCommitRequest IAmazonWebServiceRequest
The GetMergeConflictsRequest type exposes the following members
Name | Description | |
---|---|---|
GetMergeConflictsRequest() |
Name | Type | Description | |
---|---|---|---|
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. |
|
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. |
|
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). |
|
MaxConflictFiles | System.Int32 |
Gets and sets the property MaxConflictFiles. The maximum number of files to include in the output. |
|
MergeOption | Amazon.CodeCommit.MergeOptionTypeEnum |
Gets and sets the property MergeOption. The merge option or strategy you want to use to merge the code. |
|
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. |
|
RepositoryName | System.String |
Gets and sets the property RepositoryName. The name of the repository where the pull request was created. |
|
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). |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5, 4.0, 3.5