404

[ Avaa Bypassed ]




Upload:

Command:

botdev@18.217.203.133: ~ $
**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 ``feature-randomizationfeature`` and a destination branch named 'main' in a repository named ``MyDemoRepo``. ::

    aws codecommit get-merge-conflicts \
        --repository-name MyDemoRepo \
        --source-commit-specifier feature-randomizationfeature \
        --destination-commit-specifier main \
        --merge-option THREE_WAY_MERGE

Output::

    {
        "mergeable": false,
        "destinationCommitId": "86958e0aEXAMPLE",
        "sourceCommitId": "6ccd57fdEXAMPLE",
        "baseCommitId": "767b6958EXAMPLE",
        "conflictMetadataList": [
            {
                "filePath": "readme.md",
                "fileSizes": {
                    "source": 139,
                    "destination": 230,
                    "base": 85
                },
                "fileModes": {
                    "source": "NORMAL",
                    "destination": "NORMAL",
                    "base": "NORMAL"
                },
                "objectTypes": {
                    "source": "FILE",
                    "destination": "FILE",
                    "base": "FILE"
                },
                "numberOfConflicts": 1,
                "isBinaryFile": {
                    "source": false,
                    "destination": false,
                    "base": false
                },
                "contentConflict": true,
                "fileModeConflict": false,
                "objectTypeConflict": false,
                "mergeOperations": {
                    "source": "M",
                    "destination": "M"
                }
            }
        ]
    }

Filemanager

Name Type Size Permission Actions
associate-approval-rule-template-with-repository.rst File 687 B 0644
batch-associate-approval-rule-template-with-repositories.rst File 1.04 KB 0644
batch-describe-merge-conflicts.rst File 2.79 KB 0644
batch-disassociate-approval-rule-template-from-repositories.rst File 914 B 0644
batch-get-commits.rst File 1.73 KB 0644
batch-get-repositories.rst File 1.71 KB 0644
create-approval-rule-template.rst File 1.91 KB 0644
create-branch.rst File 287 B 0644
create-commit.rst File 968 B 0755
create-pull-request-approval-rule.rst File 1.84 KB 0644
create-pull-request.rst File 2.48 KB 0644
create-repository.rst File 799 B 0644
create-unreferenced-merge-commit.rst File 1.05 KB 0644
credential-helper.rst File 1.47 KB 0755
delete-approval-rule-template.rst File 564 B 0644
delete-branch.rst File 312 B 0644
delete-comment-content.rst File 798 B 0644
delete-file.rst File 808 B 0755
delete-pull-request-approval-rule.rst File 664 B 0644
delete-repository.rst File 244 B 0644
describe-merge-conflicts.rst File 2.24 KB 0644
describe-pull-request-events.rst File 908 B 0644
disassociate-approval-rule-template-from-repository.rst File 692 B 0644
evaluate-pull-request-approval-rules.rst File 1003 B 0644
get-approval-rule-template.rst File 1.3 KB 0644
get-blob.rst File 368 B 0644
get-branch.rst File 330 B 0644
get-comment-reactions.rst File 1.91 KB 0644
get-comment.rst File 880 B 0644
get-comments-for-compared-commit.rst File 2.47 KB 0644
get-comments-for-pull-request.rst File 2.33 KB 0644
get-commit.rst File 917 B 0644
get-differences.rst File 1.27 KB 0644
get-file.rst File 789 B 0755
get-folder.rst File 1.95 KB 0755
get-merge-commit.rst File 941 B 0644
get-merge-conflicts.rst File 1.77 KB 0644
get-merge-options.rst File 996 B 0644
get-pull-request-approval-states.rst File 702 B 0644
get-pull-request-override-state.rst File 811 B 0644
get-pull-request.rst File 1.84 KB 0644
get-repository-triggers.rst File 1.05 KB 0644
get-repository.rst File 872 B 0644
list-approval-rule-templates.rst File 795 B 0644
list-associated-approval-rule-templates-for-repository.rst File 717 B 0644
list-branches.rst File 282 B 0644
list-pull-requests.rst File 515 B 0644
list-repositories-for-approval-rule-template.rst File 684 B 0644
list-repositories.rst File 483 B 0644
list-tags-for-resource.rst File 604 B 0644
merge-branches-by-fast-forward.rst File 743 B 0644
merge-branches-by-squash.rst File 890 B 0644
merge-branches-by-three-way.rst File 892 B 0644
merge-pull-request-by-fast-forward.rst File 2.3 KB 0644
merge-pull-request-by-squash.rst File 2.85 KB 0644
merge-pull-request-by-three-way.rst File 2.78 KB 0644
override-pull-request-approval-rules.rst File 715 B 0644
post-comment-for-compared-commit.rst File 1.46 KB 0644
post-comment-for-pull-request.rst File 1.68 KB 0644
post-comment-reply.rst File 924 B 0644
put-comment-reaction.rst File 623 B 0644
put-file.rst File 815 B 0644
put-repository-triggers.rst File 1.36 KB 0644
tag-resource.rst File 535 B 0644
test-repository-triggers.rst File 613 B 0644
untag-resource.rst File 565 B 0644
update-approval-rule-template-content.rst File 1.63 KB 0644
update-approval-rule-template-description.rst File 1.49 KB 0644
update-approval-rule-template-name.rst File 1.38 KB 0644
update-comment.rst File 897 B 0644
update-default-branch.rst File 312 B 0644
update-pull-request-approval-rule-content.rst File 1.49 KB 0644
update-pull-request-approval-state.rst File 740 B 0644
update-pull-request-description.rst File 1.26 KB 0644
update-pull-request-status.rst File 1.97 KB 0644
update-pull-request-title.rst File 2.28 KB 0644
update-repository-description.rst File 336 B 0644
update-repository-name.rst File 660 B 0644