jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Provide missing merge flags #615

Merged
takuji merged 2 commits from add-merge-options into master 2020-06-04 22:34:37 -05:00
Conversation 0 Commits 2 Files Changed 1 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cbedf1d04 - Show all commits

11
merge.go
View File

@ -126,12 +126,13 @@ const (
// continue resolving conflicts. The merge operation will fail with
// GIT_EMERGECONFLICT and no index will be returned.
MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT
// Do not write the REUC extension on the generated index
// MergeTreeSkipREUC specifies not to write the REUC extension on the
// generated index.
MergeTreeSkipREUC MergeTreeFlag = C.GIT_MERGE_SKIP_REUC
// 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`.
// MergeTreeNoRecursive specifies not to build a recursive merge base (by
// merging the multiple merge bases) if the commits being merged have
// multiple merge bases. Instead, the first base is used.
// This flag provides a similar merge base to `git-merge-resolve`.
MergeTreeNoRecursive MergeTreeFlag = C.GIT_MERGE_NO_RECURSIVE
)