C# (CSharp) UniGit GitConflictsHandler.ResolveConflicts Examples

Example #1

File: GitDiffWindow.cs Project: simeonradivoev/UniGit-Test

 private void ResolveConflictsCallback(object path)
 {
     GitConflictsHandler.ResolveConflicts((string)path, MergeFileFavor.Normal);
 }

Example #2

 private void ResolveConflictsTheirsCallback(object localPath)
 {
     conflictsHandler.ResolveConflicts((string)localPath, MergeFileFavor.Theirs);
 }