Skip to content

Conflict

Source code in docs_src/capo_codecommit/types/conflict.py 
12
13
14
15
16
17
18
class Conflict(TypedDict, closed=True):
    conflict_metadata: NotRequired[
        "capo_codecommit.types.conflict_metadata.ConflictMetadata"
    ]
    """<p>Metadata about a conflict in a merge operation.</p>"""
    merge_hunks: NotRequired["capo_codecommit.types.merge_hunks.MergeHunks"]
    """<p>A list of hunks that contain the differences between files or lines causing the conflict.</p>"""

conflict_metadata instance-attribute 

conflict_metadata: NotRequired[ConflictMetadata]

Metadata about a conflict in a merge operation.

merge_hunks instance-attribute 

merge_hunks: NotRequired[MergeHunks]

A list of hunks that contain the differences between files or lines causing the conflict.