API: five_tuple

__all__ module-attribute

__all__ = ['Conflict5Tuple']

Conflict5Tuple

Bases: BaseModel

Merge Conflict represented in a 5-tuple structure. Contains the 5 necessary versions of a conflicting file (A, B, O, M, R).

base_content instance-attribute

base_content

(O) Content of the 'base' version in the merge conflict.

NOTE: In case of diverging history merges, this content may be a virtual base. Git defaults to creating a virtual base, an amalgamation of all qualifying bases, in case of multiple base merges.

NOTE: Virtual bases do NOT match any single committed version.

conflict_content instance-attribute

conflict_content

(M) Content of the merge conflict, expected to include conflict markers.

merge_config instance-attribute

merge_config

Configurations used for this merge conflict.

Reference Git - merge-config Documentation

ours_content instance-attribute

ours_content

(A) Content of the 'ours' version in the merge conflict.

resolved_content instance-attribute

resolved_content

(R) Content of the resolved merge conflict.

theirs_content instance-attribute

theirs_content

(B) Content of the 'theirs' version in the merge conflict.