Ejemplos de Microsoft.TeamFoundation.VersionControl.Client Workspace.ResolveConflict en C# (CSharp)

Ejemplo n.º 1

Archivo: BranchesViewModel.cs Proyecto: Manuel-S/AutoMerge

 private static void TryResolve(Workspace workspace, Conflict conflict, MergeOption mergeOption)
 {
     if (mergeOption == MergeOption.KeepTarget)
     {
         conflict.Resolution = Resolution.AcceptYours;
         workspace.ResolveConflict(conflict);
     }
     if (mergeOption == MergeOption.OverwriteTarget)
     {
         conflict.Resolution = Resolution.AcceptTheirs;
         workspace.ResolveConflict(conflict);
     }
 }