HEX
Server: LiteSpeed
System: Linux ip-172-31-76-142.ec2.internal 4.14.158-129.185.amzn2.x86_64 #1 SMP Tue Dec 24 03:15:32 UTC 2019 x86_64
User: 69b4844ae61d4e92bf26ad98af552775 (1065)
PHP: 7.2.27
Disabled: exec,passthru,shell_exec,system,eval
Upload Files
File: //lib/python2.7/site-packages/awscli/examples/codecommit/get-merge-options.rst
**To get information about the merge options available for merging two specified branches**

The following ``get-merge-options`` example determines the merge options available for merging a source branch named ``bugfix-bug1234`` with a destination branch named ``master`` in a repository named ``MyDemoRepo``. ::

    aws codecommit get-merge-options \
        --source-commit-specifier bugfix-bug1234 \
        --destination-commit-specifier master \
        --repository-name MyDemoRepo

Output::

    {
        "mergeOptions": [
            "FAST_FORWARD_MERGE",
            "SQUASH_MERGE",
            "THREE_WAY_MERGE"
        ],
        "sourceCommitId": "18059494EXAMPLE",
        "destinationCommitId": "ffd3311dEXAMPLE",
        "baseCommitId": "ffd3311dEXAMPLE"
    } 


For more information, see `Resolve Conflicts in a Pull Request <https://docs.aws.amazon.com/codecommit/latest/userguide/how-to-resolve-conflict-pull-request.html#get-merge-options>`__ in the *AWS CodeCommit User Guide*.