What is the LibGit2Sharp equivalent of 'git checkout --ours'? -
when having content conflict when merging 2 branches, solution we'd adopt take our files or files instead of using merge tool.
in git command, can use --ours , theirs git checkout --ours -- git checkout --theirs --
does know libgit2sharp equivalent of it?
when having content conflict when merging 2 branches, solution we'd adopt take our files or files instead of using merge tool. know libgit2sharp equivalent of it?
the merge() method accepts mergeoptions parameter exposes fileconflictstrategy get/setter.
see test shows how leverage it.
in git command, can use --ours , theirs git checkout --ours -- git checkout --theirs --
surprisingly, although option available cherrypick, merge , revert, not available yet in libgit2sharp checkout() method.
to purpose up-for-grabs feature request #868 has been created.
Comments
Post a Comment