libgit2

git_merge_flag_t

Version:

Flags for git_merge options. A combination of these flags can be passed in via the flags value in the git_merge_options.

Values

GIT_MERGE_FIND_RENAMES
(1 << 0)

Detect renames that occur between the common ancestor and the "ours" side or the common ancestor and the "theirs" side. This will enable the ability to merge between a modified and renamed file.

GIT_MERGE_FAIL_ON_CONFLICT
(1 << 1)

If a conflict occurs, exit immediately instead of attempting to continue resolving conflicts. The merge operation will fail with GIT_EMERGECONFLICT and no index will be returned.

GIT_MERGE_SKIP_REUC
(1 << 2)

Do not write the REUC extension on the generated index

GIT_MERGE_NO_RECURSIVE
(1 << 3)

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. This flag provides a similar merge base to git-merge-resolve.

GIT_MERGE_VIRTUAL_BASE
(1 << 4)

Treat this merge as if it is to produce the virtual base of a recursive merge. This will ensure that there are no conflicts, any conflicting regions will keep conflict markers in the merge result.

Versions