MergeFlags
Description:
[ CCode ( cprefix = "GGIT_MERGE_" , type_id = "ggit_merge_flags_get_type ()" ) ]
[ Flags ]
public enum MergeFlags
Content:
Enum values:
- FAIL_ON_CONFLICT - If a conflict
occurs, exit immediately instead of attempting to continue resolving conflicts.
- FIND_RENAMES - detect renames that
occur between the common ancestor and the "ours" side or the common ancestor and the "theirs" side.
- NO_RECURSIVE - If the commits being
merged have multiple merge bases, do not build a recursive merge base (by merging the multiple merge bases), instead simply use the
first base.
- SKIP_REUC - do not write the REUC
extension on the generated index.