public static bool HandleMergeConflicts(GitUICommands aCommands, IWin32Window owner, bool offerCommit = true, bool offerUpdateSubmodules = true) { if (aCommands.Module.InTheMiddleOfConflictedMerge()) { if (MessageBoxes.UnresolvedMergeConflicts(owner)) { SolveMergeConflicts(aCommands, owner, offerCommit); } return true; } if (offerUpdateSubmodules) aCommands.UpdateSubmodules(owner); return false; }
public static bool HandleMergeConflicts(GitUICommands aCommands, IWin32Window owner, bool offerCommit = true, bool offerUpdateSubmodules = true) { if (aCommands.Module.InTheMiddleOfConflictedMerge()) { if (MessageBoxes.UnresolvedMergeConflicts(owner)) { SolveMergeConflicts(aCommands, owner, offerCommit); } return(true); } if (offerUpdateSubmodules) { aCommands.UpdateSubmodules(owner); } return(false); }
public static bool HandleMergeConflicts(GitUICommands commands, IWin32Window?owner, bool offerCommit = true, bool offerUpdateSubmodules = true) { if (commands.Module.InTheMiddleOfConflictedMerge()) { if (AppSettings.DontConfirmResolveConflicts || MessageBoxes.ConfirmResolveMergeConflicts(owner)) { SolveMergeConflicts(commands, owner, offerCommit); } return(true); } if (offerUpdateSubmodules) { commands.UpdateSubmodules(owner); } return(false); }