private boolean checkConflict(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineCount) throws IOException { boolean conflict = false; while (intersect(localChanges.current(), latestChanges.current(), baseLineCount) && !isEqualChange(localChanges.current(), latestChanges.current(), localLines, latestLines)) { conflict = true; if (localChanges.current().getLeftTo() <= latestChanges.current().getLeftTo()) { if (localChanges.hasNext() && intersect(localChanges.peekNext(), latestChanges.current(), baseLineCount)) { localChanges.forward(); } else { break; } } else { if (latestChanges.hasNext() && intersect(localChanges.current(), latestChanges.peekNext(), baseLineCount)) { latestChanges.forward(); } else { break; } } } return conflict; }
private boolean checkConflict(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineCount) throws IOException { boolean conflict = false; while (intersect(localChanges.current(), latestChanges.current(), baseLineCount) && !isEqualChange(localChanges.current(), latestChanges.current(), localLines, latestLines)) { conflict = true; if (localChanges.current().getLeftTo() <= latestChanges.current().getLeftTo()) { if (localChanges.hasNext() && intersect(localChanges.peekNext(), latestChanges.current(), baseLineCount)) { localChanges.forward(); } else { break; } } else { if (latestChanges.hasNext() && intersect(localChanges.current(), latestChanges.peekNext(), baseLineCount)) { latestChanges.forward(); } else { break; } } } return conflict; }
private boolean checkConflict(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineCount) throws IOException { boolean conflict = false; while (intersect(localChanges.current(), latestChanges.current(), baseLineCount) && !isEqualChange(localChanges.current(), latestChanges.current(), localLines, latestLines)) { conflict = true; if (localChanges.current().getLeftTo() <= latestChanges.current().getLeftTo()) { if (localChanges.hasNext() && intersect(localChanges.peekNext(), latestChanges.current(), baseLineCount)) { localChanges.forward(); } else { break; } } else { if (latestChanges.hasNext() && intersect(localChanges.current(), latestChanges.peekNext(), baseLineCount)) { latestChanges.forward(); } else { break; } } } return conflict; }
private boolean checkConflict(FSMergerBySequenceList localChanges, FSMergerBySequenceList latestChanges, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineCount) throws IOException { boolean conflict = false; while (intersect(localChanges.current(), latestChanges.current(), baseLineCount) && !isEqualChange(localChanges.current(), latestChanges.current(), localLines, latestLines)) { conflict = true; if (localChanges.current().getLeftTo() <= latestChanges.current().getLeftTo()) { if (localChanges.hasNext() && intersect(localChanges.peekNext(), latestChanges.current(), baseLineCount)) { localChanges.forward(); } else { break; } } else { if (latestChanges.hasNext() && intersect(localChanges.current(), latestChanges.peekNext(), baseLineCount)) { latestChanges.forward(); } else { break; } } } return conflict; }