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. If the merge is successful, it closes the pull request
Options
| Name | Description |
|---|---|
--pull-request-id <string> | The system-generated ID of the pull request. To get this ID, use ListPullRequests |
--repository-name <string> | The name of the repository where the pull request was created |
--source-commit-id <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 |
--conflict-detail-level <string> | 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 |
--conflict-resolution-strategy <string> | 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 |
--commit-message <string> | The commit message to include in the commit information for the merge |
--author-name <string> | The name of the author who created the commit. This information is used as both the author and committer for the commit |
--email <string> | The email address of the person merging the branches. This information is used in the commit information for the merge |
--keep-empty-folders | 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 |
--no-keep-empty-folders | 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 |
--conflict-resolution <structure> | If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge |
--cli-input-json <string> | Performs service operation based on the JSON string provided. The JSON string follows the format provided by ``--generate-cli-skeleton``. If other arguments are provided on the command line, the CLI values will override the JSON-provided values. It is not possible to pass arbitrary binary values using a JSON-provided value as the string will be taken literally |
--generate-cli-skeleton <string> | Prints a JSON skeleton to standard output without sending an API request. If provided with no value or the value ``input``, prints a sample input JSON that can be used as an argument for ``--cli-input-json``. If provided with the value ``output``, it validates the command inputs and returns a sample output JSON for that command |