AWS Tools for Windows PowerShell
Command 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.

Synopsis

Calls the AWS CodeCommit MergePullRequestByThreeWay API operation.

Syntax

Merge-CCPullRequestByThreeWay
-RepositoryName <String>
-AuthorName <String>
-CommitMessage <String>
-ConflictDetailLevel <ConflictDetailLevelTypeEnum>
-ConflictResolutionStrategy <ConflictResolutionStrategyTypeEnum>
-ConflictResolution_DeleteFile <DeleteFileEntry[]>
-Email <String>
-KeepEmptyFolder <Boolean>
-PullRequestId <String>
-ConflictResolution_ReplaceContent <ReplaceContentEntry[]>
-ConflictResolution_SetFileMode <SetFileModeEntry[]>
-SourceCommitId <String>
-Select <String>
-PassThru <SwitchParameter>
-Force <SwitchParameter>
-ClientConfig <AmazonCodeCommitConfig>

Description

Attempts to merge the source commit of a pull request into the specified destination branch for that pull request at the specified commit using the three-way merge strategy. If the merge is successful, it closes the pull request.

Parameters

-AuthorName <String>
The name of the author who created the commit. This information is used as both the author and committer for the commit.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-ClientConfig <AmazonCodeCommitConfig>
Amazon.PowerShell.Cmdlets.CC.AmazonCodeCommitClientCmdlet.ClientConfig
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-CommitMessage <String>
The commit message to include in the commit information for the merge.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-ConflictDetailLevel <ConflictDetailLevelTypeEnum>
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.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-ConflictResolution_DeleteFile <DeleteFileEntry[]>
Files to be deleted as part of the merge conflict resolution.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesConflictResolution_DeleteFiles
-ConflictResolution_ReplaceContent <ReplaceContentEntry[]>
Files to have content replaced as part of the merge conflict resolution.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesConflictResolution_ReplaceContents
-ConflictResolution_SetFileMode <SetFileModeEntry[]>
File modes that are set as part of the merge conflict resolution.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesConflictResolution_SetFileModes
-ConflictResolutionStrategy <ConflictResolutionStrategyTypeEnum>
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.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-Email <String>
The email address of the person merging the branches. This information is used in the commit information for the merge.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-Force <SwitchParameter>
This parameter overrides confirmation prompts to force the cmdlet to continue its operation. This parameter should always be used with caution.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-KeepEmptyFolder <Boolean>
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.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesKeepEmptyFolders
-PassThru <SwitchParameter>
Changes the cmdlet behavior to return the value passed to the RepositoryName parameter. The -PassThru parameter is deprecated, use -Select '^RepositoryName' instead. This parameter will be removed in a future version.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-PullRequestId <String>
The system-generated ID of the pull request. To get this ID, use ListPullRequests.
Required?True
Position?Named
Accept pipeline input?True (ByPropertyName)
-RepositoryName <String>
The name of the repository where the pull request was created.
Required?True
Position?1
Accept pipeline input?True (ByValue, ByPropertyName)
-Select <String>
Use the -Select parameter to control the cmdlet output. The default value is 'PullRequest'. Specifying -Select '*' will result in the cmdlet returning the whole service response (Amazon.CodeCommit.Model.MergePullRequestByThreeWayResponse). Specifying the name of a property of type Amazon.CodeCommit.Model.MergePullRequestByThreeWayResponse will result in that property being returned. Specifying -Select '^ParameterName' will result in the cmdlet returning the selected cmdlet parameter value.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-SourceCommitId <String>
The full commit ID of the original or updated commit in the pull request source branch. Pass this value if you want an exception thrown if the current commit ID of the tip of the source branch does not match this commit ID.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)

Common Credential and Region Parameters

-AccessKey <String>
The AWS access key for the user account. This can be a temporary access key if the corresponding session token is supplied to the -SessionToken parameter.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesAK
-Credential <AWSCredentials>
An AWSCredentials object instance containing access and secret key information, and optionally a token for session-based credentials.
Required?False
Position?Named
Accept pipeline input?True (ByValue, ByPropertyName)
-EndpointUrl <String>
The endpoint to make the call against.Note: This parameter is primarily for internal AWS use and is not required/should not be specified for normal usage. The cmdlets normally determine which endpoint to call based on the region specified to the -Region parameter or set as default in the shell (via Set-DefaultAWSRegion). Only specify this parameter if you must direct the call to a specific custom endpoint.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
-NetworkCredential <PSCredential>
Used with SAML-based authentication when ProfileName references a SAML role profile. Contains the network credentials to be supplied during authentication with the configured identity provider's endpoint. This parameter is not required if the user's default network identity can or should be used during authentication.
Required?False
Position?Named
Accept pipeline input?True (ByValue, ByPropertyName)
-ProfileLocation <String>
Used to specify the name and location of the ini-format credential file (shared with the AWS CLI and other AWS SDKs)If this optional parameter is omitted this cmdlet will search the encrypted credential file used by the AWS SDK for .NET and AWS Toolkit for Visual Studio first. If the profile is not found then the cmdlet will search in the ini-format credential file at the default location: (user's home directory)\.aws\credentials.If this parameter is specified then this cmdlet will only search the ini-format credential file at the location given.As the current folder can vary in a shell or during script execution it is advised that you use specify a fully qualified path instead of a relative path.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesAWSProfilesLocation, ProfilesLocation
-ProfileName <String>
The user-defined name of an AWS credentials or SAML-based role profile containing credential information. The profile is expected to be found in the secure credential file shared with the AWS SDK for .NET and AWS Toolkit for Visual Studio. You can also specify the name of a profile stored in the .ini-format credential file used with the AWS CLI and other AWS SDKs.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesStoredCredentials, AWSProfileName
-Region <Object>
The system name of an AWS region or an AWSRegion instance. This governs the endpoint that will be used when calling service operations. Note that the AWS resources referenced in a call are usually region-specific.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesRegionToCall
-SecretKey <String>
The AWS secret key for the user account. This can be a temporary secret key if the corresponding session token is supplied to the -SessionToken parameter.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesSK, SecretAccessKey
-SessionToken <String>
The session token if the access and secret keys are temporary session-based credentials.
Required?False
Position?Named
Accept pipeline input?True (ByPropertyName)
AliasesST

Outputs

Amazon.CodeCommit.Model.PullRequest or Amazon.CodeCommit.Model.MergePullRequestByThreeWayResponse
This cmdlet returns an Amazon.CodeCommit.Model.PullRequest object. The service call response (type Amazon.CodeCommit.Model.MergePullRequestByThreeWayResponse) can also be referenced from properties attached to the cmdlet entry in the $AWSHistory stack.
User Guide
Service API Reference
AWS Tools for PowerShell User Guide

Supported Version

AWS Tools for PowerShell: 2.x.y.z