Skip to content
AWS for Query.Farm

aws.codecommit.describe_merge_conflicts

Example SQL Queries

SELECT * FROM
aws.codecommit.describe_merge_conflicts
WHERE
"repository_name" = 'VALUE'
AND "destination_commit_specifier" = 'VALUE'
AND "source_commit_specifier" = 'VALUE'
AND "merge_option" = 'VALUE'
AND "file_path" = 'VALUE';

Description

Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.

Table Definition

Column NameColumn Data Type
destination_commit_specifier Required Input Column

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

VARCHAR
file_path Required Input Column

The path of the target files used to describe the conflicts. 

VARCHAR
merge_option Required Input Column

The merge option or strategy you want to use to merge the code.

VARCHAR
repository_name Required Input Column

The name of the repository where you want to get information about a merge conflict.

VARCHAR
source_commit_specifier Required Input Column

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

VARCHAR
conflict_detail_level Input Column

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

VARCHAR
conflict_resolution_strategy Input Column

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

VARCHAR
max_merge_hunks Input Column

The maximum number of merge hunks to include in the output.

BIGINT
next_token Input Column

An enumeration token that can be used in a request to return the next batch of the results.

VARCHAR
_aws_profile Input Column

The AWS profile defines the AWS identity used. It can be defined via credentials or by assuming a IAM role.

STRUCT(
    "type" VARCHAR,
    "name" VARCHAR,
    "account_id" VARCHAR,
    "via_profile_name" VARCHAR,
    "assumed_role_arn" VARCHAR,
    "organization" STRUCT(
        "account_name" VARCHAR,
        "id" VARCHAR,
        "tags" STRUCT(
            "key" VARCHAR,
            "value" VARCHAR
        )[],
        "master_account" STRUCT(
            "id" VARCHAR,
            "email" VARCHAR
        ),
        "parents" STRUCT(
            "type" VARCHAR,
            "id" VARCHAR,
            "name" VARCHAR,
            "tags" STRUCT(
                "key" VARCHAR,
                "value" VARCHAR
            )[]
        )[]
    )
)
Show child fields
_aws_profile.account_id

The AWS account id

_aws_profile.assumed_role_arn

The ARN of the assumed role

_aws_profile.name

The unique name of the profile.

_aws_profile.organization

Information about this profile's membership in the AWS organization.

Show child fields
_aws_profile.organization.account_name

The name of account speciifed by the organization

_aws_profile.organization.id

The organization id

_aws_profile.organization.master_account
Show child fields
_aws_profile.organization.master_account.email

The organization master account email address

_aws_profile.organization.master_account.id

The organization master account id

_aws_profile.organization.parents[]
Show child fields
_aws_profile.organization.parents[].id

The id of the parent

_aws_profile.organization.parents[].name

The name of the parent

_aws_profile.organization.parents[].tags[]
Show child fields
_aws_profile.organization.parents[].tags[].key
_aws_profile.organization.parents[].tags[].value
_aws_profile.organization.parents[].type

The type of parent can be an organization unit or a root

_aws_profile.organization.tags[]
Show child fields
_aws_profile.organization.tags[].key
_aws_profile.organization.tags[].value
_aws_profile.type

The type of profile, either 'credentials' or 'assumed_role'

_aws_profile.via_profile_name

This IAM role for this profile is assumed by first utilizing another profile with this name to obtain credentials.

_aws_region Input Column

The AWS region to use.

VARCHAR
base_commit_id

The commit ID of the merge base.

VARCHAR
conflict_metadata

Contains metadata about the conflicts found in the merge.

STRUCT(
    "file_path" VARCHAR,
    "file_sizes" STRUCT(
        "source" BIGINT,
        "destination" BIGINT,
        "base" BIGINT
    ),
    "file_modes" STRUCT(
        "source" VARCHAR,
        "destination" VARCHAR,
        "base" VARCHAR
    ),
    "object_types" STRUCT(
        "source" VARCHAR,
        "destination" VARCHAR,
        "base" VARCHAR
    ),
    "number_of_conflicts" BIGINT,
    "is_binary_file" STRUCT(
        "source" BOOLEAN,
        "destination" BOOLEAN,
        "base" BOOLEAN
    ),
    "content_conflict" BOOLEAN,
    "file_mode_conflict" BOOLEAN,
    "object_type_conflict" BOOLEAN,
    "merge_operations" STRUCT(
        "source" VARCHAR,
        "destination" VARCHAR
    )
)
Show child fields
conflict_metadata.content_conflict

A boolean value indicating whether there are conflicts in the content of a file.

conflict_metadata.file_mode_conflict

A boolean value indicating whether there are conflicts in the file mode of a file.

conflict_metadata.file_modes

The file modes of the file in the source, destination, and base of the merge.

Show child fields
conflict_metadata.file_modes.base

The file mode of a file in the base of a merge or pull request.

conflict_metadata.file_modes.destination

The file mode of a file in the destination of a merge or pull request.

conflict_metadata.file_modes.source

The file mode of a file in the source of a merge or pull request.

conflict_metadata.file_path

The path of the file that contains conflicts.

conflict_metadata.file_sizes

The file sizes of the file in the source, destination, and base of the merge.

Show child fields
conflict_metadata.file_sizes.base

The size of a file in the base of a merge or pull request.

conflict_metadata.file_sizes.destination

The size of a file in the destination of a merge or pull request.

conflict_metadata.file_sizes.source

The size of a file in the source of a merge or pull request.

conflict_metadata.is_binary_file

A boolean value (true or false) indicating whether the file is binary or textual in the source, destination, and base of the merge.

Show child fields
conflict_metadata.is_binary_file.base

The binary or non-binary status of a file in the base of a merge or pull request.

conflict_metadata.is_binary_file.destination

The binary or non-binary status of a file in the destination of a merge or pull request.

conflict_metadata.is_binary_file.source

The binary or non-binary status of file in the source of a merge or pull request.

conflict_metadata.merge_operations

Whether an add, modify, or delete operation caused the conflict between the source and destination of the merge.

Show child fields
conflict_metadata.merge_operations.destination

The operation on a file in the destination of a merge or pull request.

conflict_metadata.merge_operations.source

The operation (add, modify, or delete) on a file in the source of a merge or pull request.

conflict_metadata.number_of_conflicts

The number of conflicts, including both hunk conflicts and metadata conflicts.

conflict_metadata.object_type_conflict

A boolean value (true or false) indicating whether there are conflicts between the branches in the object type of a file, folder, or submodule.

conflict_metadata.object_types

Information about any object type conflicts in a merge operation.

Show child fields
conflict_metadata.object_types.base

The type of the object in the base commit of the merge.

conflict_metadata.object_types.destination

The type of the object in the destination branch.

conflict_metadata.object_types.source

The type of the object in the source branch.

destination_commit_id

The commit ID of the destination commit specifier that was used in the merge evaluation.

VARCHAR
merge_hunks

A list of merge hunks of the differences between the files or lines.

STRUCT(
    "is_conflict" BOOLEAN,
    "source" STRUCT(
        "start_line" BIGINT,
        "end_line" BIGINT,
        "hunk_content" VARCHAR
    ),
    "destination" STRUCT(
        "start_line" BIGINT,
        "end_line" BIGINT,
        "hunk_content" VARCHAR
    ),
    "base" STRUCT(
        "start_line" BIGINT,
        "end_line" BIGINT,
        "hunk_content" VARCHAR
    )
)[]
Show child fields
merge_hunks[]
Show child fields
merge_hunks[].base

Information about the merge hunk in the base of a merge or pull request.

Show child fields
merge_hunks[].base.end_line

The end position of the hunk in the merge result.

merge_hunks[].base.hunk_content

The base-64 encoded content of the hunk merged region that might contain a conflict.

merge_hunks[].base.start_line

The start position of the hunk in the merge result.

merge_hunks[].destination

Information about the merge hunk in the destination of a merge or pull request.

Show child fields
merge_hunks[].destination.end_line

The end position of the hunk in the merge result.

merge_hunks[].destination.hunk_content

The base-64 encoded content of the hunk merged region that might contain a conflict.

merge_hunks[].destination.start_line

The start position of the hunk in the merge result.

merge_hunks[].is_conflict

A Boolean value indicating whether a combination of hunks contains a conflict. Conflicts occur when the same file or the same lines in a file were modified in both the source and destination of a merge or pull request. Valid values include true, false, and null. True when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge do not set this to true.

merge_hunks[].source

Information about the merge hunk in the source of a merge or pull request.

Show child fields
merge_hunks[].source.end_line

The end position of the hunk in the merge result.

merge_hunks[].source.hunk_content

The base-64 encoded content of the hunk merged region that might contain a conflict.

merge_hunks[].source.start_line

The start position of the hunk in the merge result.

source_commit_id

The commit ID of the source commit specifier that was used in the merge evaluation.

VARCHAR