private static TryResolve ( Workspace workspace, Conflict conflict, MergeOption mergeOption ) : void | ||
workspace | Workspace | |
conflict | Conflict | |
mergeOption | MergeOption | |
Résultat | void |
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);
}
}