| Server IP : 69.72.244.102 / Your IP : 216.73.217.142 Web Server : LiteSpeed System : Linux s3434.fra1.stableserver.net 4.18.0-513.24.1.lve.2.el8.x86_64 #1 SMP Fri May 24 12:42:50 UTC 2024 x86_64 User : konzalta ( 1271) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON | Sudo : OFF | Pkexec : OFF Directory : /proc/thread-self/root/lib/python3.6/site-packages/awscli/examples/codecommit/ |
Upload File : |
**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*.