HEX
Server: Apache
System: Linux server1.panigaletech.com 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64
User: www-data (33)
PHP: 7.4.30
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: //usr/lib/python3/dist-packages/awscli/examples/codecommit/get-merge-conflicts.rst
**To view whether there are any merge conflicts for a pull request**

The following ``get-merge-conflicts`` example displays whether there are any merge conflicts between the tip of a source branch named 'my-feature-branch' and a destination branch named 'master' in a repository named 'MyDemoRepo'. ::

    aws codecommit get-merge-conflicts \
        --repository-name MyDemoRepo \
        --source-commit-specifier my-feature-branch \
        --destination-commit-specifier master \
        --merge-option FAST_FORWARD_MERGE

Output::

    {
        "destinationCommitId": "fac04518EXAMPLE",
        "mergeable": false,
        "sourceCommitId": "16d097f03EXAMPLE"
    }