/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {
/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
/** * Add section with conflicting paths to merge message. * * @param message * the original merge message * @param conflictingPaths * the paths with conflicts * @return merge message with conflicting paths added */ public String formatWithConflicts(String message, List<String> conflictingPaths) { StringBuilder sb = new StringBuilder(); String[] lines = message.split("\n"); //$NON-NLS-1$ int firstFooterLine = ChangeIdUtil.indexOfFirstFooterLine(lines); for (int i = 0; i < firstFooterLine; i++) sb.append(lines[i]).append('\n'); if (firstFooterLine == lines.length && message.length() != 0) sb.append('\n'); addConflictsMessage(conflictingPaths, sb); if (firstFooterLine < lines.length) sb.append('\n'); for (int i = firstFooterLine; i < lines.length; i++) sb.append(lines[i]).append('\n'); return sb.toString(); }
int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {
int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) {