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); } }