public static bool HandleConflictSelectBase(string fileName) { if (!HandleConflictsSaveSide(fileName, fileName, "1")) return false; RunCmd(Settings.GitCommand, "add -- \"" + fileName + "\""); return true; }