HEX
Server: LiteSpeed
System: Linux s3604.bom1.stableserver.net 4.18.0-513.11.1.lve.el8.x86_64 #1 SMP Thu Jan 18 16:21:02 UTC 2024 x86_64
User: dmstechonline (1480)
PHP: 7.4.33
Disabled: NONE
Upload Files
File: //lib/python3.6/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*.