private void ResolveSourceControlConflicts(eResolveConflictsSide side) { AutoLogProxy.UserOperationStart("ResolveConflictsBtn_Click"); Reporter.ToGingerHelper(eGingerHelperMsgKey.ResolveSourceControlConflicts); SourceControlIntegration.ResolveConflicts(App.UserProfile.Solution.SourceControl, App.UserProfile.Solution.Folder, side); Reporter.CloseGingerHelper(); AutoLogProxy.UserOperationEnd(); }
private void ResolveSourceControlConflicts(eResolveConflictsSide side) { AutoLogProxy.UserOperationStart("ResolveConflictsBtn_Click"); Reporter.ToStatus(eStatusMsgKey.ResolveSourceControlConflicts); SourceControlIntegration.ResolveConflicts(WorkSpace.UserProfile.Solution.SourceControl, WorkSpace.UserProfile.Solution.Folder, side); Reporter.HideStatusMessage(); AutoLogProxy.UserOperationEnd(); }
private void ResolveSourceControlConflicts(eResolveConflictsSide side) { Reporter.ToStatus(eStatusMsgKey.ResolveSourceControlConflicts); SourceControlIntegration.ResolveConflicts(WorkSpace.Instance.Solution.SourceControl, WorkSpace.Instance.Solution.Folder, side); Reporter.HideStatusMessage(); }