HEX
Server: Apache
System: Linux vps-cdc32557.vps.ovh.ca 5.15.0-156-generic #166-Ubuntu SMP Sat Aug 9 00:02:46 UTC 2025 x86_64
User: hanode (1017)
PHP: 7.4.33
Disabled: pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,
Upload Files
File: //lib/python3/dist-packages/awscli/examples/codecommit/merge-branches-by-three-way.rst
**To merge two branches using the three-way merge strategy**

The following ``merge-branches-by-three-way`` example merges the specified source branch with the specified destination branch in a repository named ``MyDemoRepo``. ::

    aws codecommit merge-branches-by-three-way \
        --source-commit-specifier main \
        --destination-commit-specifier bugfix-bug1234 \
        --author-name "Jorge Souza" --email "jorge_souza@example.com" \
        --commit-message "Merging changes from main to bugfix branch before additional testing." \
        --repository-name MyDemoRepo

Output::

    {
        "commitId": "4f178133EXAMPLE",
        "treeId": "389765daEXAMPLE"
    }

For more information, see `Compare and Merge Branches <https://docs.aws.amazon.com/codecommit/latest/userguide/how-to-compare-branches.html#merge-branches-by-three-way>`__ in the *AWS CodeCommit User Guide*.