if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) {
if (style == SVNDiffConflictChoiceStyle.CHOOSE_LATEST) {
baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(),
localLines, latestLines, baseLineIndex, transformedLocalLines, style);
local.forward();
merged = true;
} else if (style == SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED) {
baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(),
localLines, latestLines, baseLineIndex, transformedLocalLines, style);
local.forward();
merged = true;
} else if (style == SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_LATEST || style == SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_ORIGINAL_LATEST) {
baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(),
localLines, latestLines, baseLineIndex, transformedLocalLines, style);
local.forward();