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 MergeBranchesByThreeWay operation. Merges two specified branches using the three-way merge strategy.
Namespace: Amazon.CodeCommit.Model
Assembly: AWSSDK.CodeCommit.dll
Version: 3.x.y.z
public class MergeBranchesByThreeWayRequest : AmazonCodeCommitRequest IAmazonWebServiceRequest
The MergeBranchesByThreeWayRequest type exposes the following members
Name | Description | |
---|---|---|
MergeBranchesByThreeWayRequest() |
Name | Type | Description | |
---|---|---|---|
AuthorName | System.String |
Gets and sets the property AuthorName. The name of the author who created the commit. This information is used as both the author and committer for the commit. |
|
CommitMessage | System.String |
Gets and sets the property CommitMessage. The commit message to include in the commit information for the merge. |
|
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. |
|
ConflictResolution | Amazon.CodeCommit.Model.ConflictResolution |
Gets and sets the property ConflictResolution. If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge. |
|
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). |
|
System.String |
Gets and sets the property Email. The email address of the person merging the branches. This information is used in the commit information for the merge. |
||
KeepEmptyFolders | System.Boolean |
Gets and sets the property KeepEmptyFolders. If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false. |
|
RepositoryName | System.String |
Gets and sets the property RepositoryName. The name of the repository where you want to merge two branches. |
|
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). |
|
TargetBranch | System.String |
Gets and sets the property TargetBranch. The branch where the merge is applied. |
.NET Core App:
Supported in: 3.1
.NET Standard:
Supported in: 2.0
.NET Framework:
Supported in: 4.5, 4.0, 3.5