Skip to content

DescribeMergeConflictsOutput

Source code in docs_src/capo_codecommit/types/describe_merge_conflicts_output.py
class DescribeMergeConflictsOutput(TypedDict, closed=True):
    conflict_metadata: "capo_codecommit.types.conflict_metadata.ConflictMetadata"
    """<p>Contains metadata about the conflicts found in the merge.</p>"""
    merge_hunks: "capo_codecommit.types.merge_hunks.MergeHunks"
    """<p>A list of merge hunks of the differences between the files or lines.</p>"""
    next_token: NotRequired["capo_codecommit.types.next_token.NextToken"]
    """<p>An enumeration token that can be used in a request to return the next batch of the results.</p>"""
    destination_commit_id: "capo_codecommit.types.object_id.ObjectId"
    """<p>The commit ID of the destination commit specifier that was used in the merge evaluation.</p>"""
    source_commit_id: "capo_codecommit.types.object_id.ObjectId"
    """<p>The commit ID of the source commit specifier that was used in the merge evaluation.</p>"""
    base_commit_id: NotRequired["capo_codecommit.types.object_id.ObjectId"]
    """<p>The commit ID of the merge base.</p>"""

base_commit_id instance-attribute

base_commit_id: NotRequired[ObjectId]

The commit ID of the merge base.

conflict_metadata instance-attribute

conflict_metadata: ConflictMetadata

Contains metadata about the conflicts found in the merge.

destination_commit_id instance-attribute

destination_commit_id: ObjectId

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

merge_hunks instance-attribute

merge_hunks: MergeHunks

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

next_token instance-attribute

next_token: NotRequired[NextToken]

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

source_commit_id instance-attribute

source_commit_id: ObjectId

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