private static void SolveMergeConflicts(GitUICommands aCommands, IWin32Window owner, bool offerCommit)
{
if (aCommands.Module.InTheMiddleOfConflictedMerge())
{
aCommands.StartResolveConflictsDialog(owner, offerCommit);
}
if (aCommands.Module.InTheMiddleOfPatch())
{
if (MessageBoxes.MiddleOfPatchApply(owner))
{
aCommands.StartApplyPatchDialog(owner);
}
}
else if (aCommands.Module.InTheMiddleOfRebase())
{
if (MessageBoxes.MiddleOfRebase(owner))
{
aCommands.StartRebaseDialog(owner, null);
}
}
}
private static void SolveMergeConflicts(GitUICommands aCommands, IWin32Window owner, bool offerCommit)
{
if (aCommands.Module.InTheMiddleOfConflictedMerge())
{
aCommands.StartResolveConflictsDialog(owner, offerCommit);
}
if (aCommands.Module.InTheMiddleOfPatch())
{
if (MessageBoxes.MiddleOfPatchApply(owner))
{
aCommands.StartApplyPatchDialog(owner);
}
}
else if (aCommands.Module.InTheMiddleOfRebase())
{
if (MessageBoxes.MiddleOfRebase(owner))
{
aCommands.StartRebaseDialog(owner, null);
}
}
}