MCPcopy Create free account
hub / github.com/libgit2/pygit2 / MergeFavor

Class MergeFavor

pygit2/enums.py:780–818  ·  view source on GitHub ↗

Merge file favor options for `Repository.merge` instruct the file-level merging functionality how to deal with conflicting regions of the files.

Source from the content-addressed store, hash-verified

778
779
780class MergeFavor(IntEnum):
781 """
782 Merge file favor options for `Repository.merge` instruct the file-level
783 merging functionality how to deal with conflicting regions of the files.
784 """
785
786 NORMAL = C.GIT_MERGE_FILE_FAVOR_NORMAL
787 """
788 When a region of a file is changed in both branches, a conflict will be
789 recorded in the index so that `checkout` can produce a merge file with
790 conflict markers in the working directory.
791
792 This is the default.
793 """
794
795 OURS = C.GIT_MERGE_FILE_FAVOR_OURS
796 """
797 When a region of a file is changed in both branches, the file created in
798 the index will contain the "ours" side of any conflicting region.
799
800 The index will not record a conflict.
801 """
802
803 THEIRS = C.GIT_MERGE_FILE_FAVOR_THEIRS
804 """
805 When a region of a file is changed in both branches, the file created in
806 the index will contain the "theirs" side of any conflicting region.
807
808 The index will not record a conflict.
809 """
810
811 UNION = C.GIT_MERGE_FILE_FAVOR_UNION
812 """
813 When a region of a file is changed in both branches, the file
814 created in the index will contain each unique line from each side,
815 which has the result of combining both files.
816
817 The index will not record a conflict.
818 """
819
820
821class MergeFileFlag(IntFlag):

Callers

nothing calls this directly

Calls

no outgoing calls

Tested by

no test coverage detected

Used in the wild real call sites across dependent graphs

searching dependent graphs…