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