private bool EvaluateResultsBasedOnSettings(bool stashed, FormProcess process)
{
if (!Module.InTheMiddleOfConflictedMerge() &&
!Module.InTheMiddleOfRebase() &&
(process != null && !process.ErrorOccurred()))
{
InitModules();
return(true);
}
// Rebase failed -> special 'rebase' merge conflict
if (Rebase.Checked && Module.InTheMiddleOfRebase())
{
UICommands.StartRebaseDialog(null);
if (!Module.InTheMiddleOfConflictedMerge() &&
!Module.InTheMiddleOfRebase())
{
return(true);
}
}
else
{
MergeConflictHandler.HandleMergeConflicts(UICommands, this);
if (!Module.InTheMiddleOfConflictedMerge() &&
!Module.InTheMiddleOfRebase())
{
return(true);
}
}
if (!AutoStash.Checked || !stashed || Module.InTheMiddleOfConflictedMerge() ||
Module.InTheMiddleOfRebase())
{
return(true);
}
return(false);
}
public bool Rebase()
{
return(UICommands.StartRebaseDialog(TreeViewNode.TreeView, FullPath));
}
public bool Rebase()
{
return(UICommands.StartRebaseDialog(ParentWindow(), onto: FullPath));
}