Flags for `Repository.merge` options. A combination of these flags can be passed in via the `flags` value.
| 859 | |
| 860 | |
| 861 | class MergeFlag(IntFlag): |
| 862 | """ |
| 863 | Flags for `Repository.merge` options. |
| 864 | A combination of these flags can be passed in via the `flags` value. |
| 865 | """ |
| 866 | |
| 867 | FIND_RENAMES = C.GIT_MERGE_FIND_RENAMES |
| 868 | """ |
| 869 | Detect renames that occur between the common ancestor and the "ours" |
| 870 | side or the common ancestor and the "theirs" side. This will enable |
| 871 | the ability to merge between a modified and renamed file. |
| 872 | """ |
| 873 | |
| 874 | FAIL_ON_CONFLICT = C.GIT_MERGE_FAIL_ON_CONFLICT |
| 875 | """ |
| 876 | If a conflict occurs, exit immediately instead of attempting to |
| 877 | continue resolving conflicts. The merge operation will raise GitError |
| 878 | (GIT_EMERGECONFLICT) and no index will be returned. |
| 879 | """ |
| 880 | |
| 881 | SKIP_REUC = C.GIT_MERGE_SKIP_REUC |
| 882 | """ |
| 883 | Do not write the REUC extension on the generated index. |
| 884 | """ |
| 885 | |
| 886 | NO_RECURSIVE = C.GIT_MERGE_NO_RECURSIVE |
| 887 | """ |
| 888 | If the commits being merged have multiple merge bases, do not build |
| 889 | a recursive merge base (by merging the multiple merge bases), |
| 890 | instead simply use the first base. This flag provides a similar |
| 891 | merge base to `git-merge-resolve`. |
| 892 | """ |
| 893 | |
| 894 | VIRTUAL_BASE = C.GIT_MERGE_VIRTUAL_BASE |
| 895 | """ |
| 896 | Treat this merge as if it is to produce the virtual base of a recursive |
| 897 | merge. This will ensure that there are no conflicts, any conflicting |
| 898 | regions will keep conflict markers in the merge result. |
| 899 | """ |
| 900 | |
| 901 | |
| 902 | class MergePreference(IntFlag): |
nothing calls this directly
no outgoing calls
no test coverage detected
searching dependent graphs…