CmdID / aws / aws codecommit
aws codecommit merge-pull-request-by-three-way
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. AWS CLI reference
10 options Its page in the AWS CLI reference
Options
--author-nameThe name of the author who created the commit.--commit-messageThe commit message to include in the commit information for the merge.--conflict-detail-levelThe level of conflict detail to use.--conflict-resolution-strategySpecifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.--conflict-resolutionIf AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.--emailThe email address of the person merging the branches.--keep-empty-foldersIf the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.--pull-request-idThe system-generated ID of the pull request.--repository-nameThe name of the repository where the pull request was created.--source-commit-idThe full commit ID of the original or updated commit in the pull request source branch.