DescribeMergeConflictsOutput
¶
Source code in docs_src/capo_codecommit/types/describe_merge_conflicts_output.py
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.