aws codecommit merge-branches-by-three-way
Merges two specified branches using the three-way merge strategy
Options
| Name | Description |
|---|---|
--repository-name <string> | The name of the repository where you want to merge two branches |
--source-commit-specifier <string> | The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID) |
--destination-commit-specifier <string> | The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID) |
--target-branch <string> | The branch where the merge is applied |
--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 |
--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 |
--commit-message <string> | The commit message to include 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 |