Пример #1
0
 private void CheckMergeConflictsOnError(IWin32Window owner)
 {
     // Rebase failed -> special 'rebase' merge conflict
     if (Rebase.Checked && Module.InTheMiddleOfRebase())
     {
         UICommands.ContinueRebase(owner);
     }
     else if (Module.InTheMiddleOfAction())
     {
         MergeConflictHandler.HandleMergeConflicts(UICommands, owner);
     }
 }