private void writeConflictMetadata(MergeChunk chunk) throws IOException { if (lastConflictingName != null && chunk.getConflictState() != ConflictState.NEXT_CONFLICTING_RANGE) { // found the end of an conflict writeConflictEnd(); } if (chunk.getConflictState() == ConflictState.FIRST_CONFLICTING_RANGE) { // found the start of an conflict writeConflictStart(chunk); } else if (chunk.getConflictState() == ConflictState.NEXT_CONFLICTING_RANGE) { // found another conflicting chunk writeConflictChange(chunk); } }
if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { nrOfConflicts++; if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { if (currentConflict > -1) { ret[currentConflict][mergeChunk.getSequenceIndex()] = mergeChunk.getBegin(); if (mergeChunk.getConflictState().equals(ConflictState.NEXT_CONFLICTING_RANGE)) { if (mergeChunk.getEnd() > endOfChunk) endOfChunk = mergeChunk.getEnd();
private void writeConflictMetadata(MergeChunk chunk) throws IOException { if (lastConflictingName != null && chunk.getConflictState() != ConflictState.NEXT_CONFLICTING_RANGE) { // found the end of an conflict writeConflictEnd(); } if (chunk.getConflictState() == ConflictState.FIRST_CONFLICTING_RANGE) { // found the start of an conflict writeConflictStart(chunk); } else if (chunk.getConflictState() == ConflictState.NEXT_CONFLICTING_RANGE) { // found another conflicting chunk writeConflictChange(chunk); } }
private void writeConflictMetadata(MergeChunk chunk) throws IOException { if (lastConflictingName != null && chunk.getConflictState() != ConflictState.NEXT_CONFLICTING_RANGE) { // found the end of an conflict writeConflictEnd(); } if (chunk.getConflictState() == ConflictState.FIRST_CONFLICTING_RANGE) { // found the start of an conflict writeConflictStart(chunk); } else if (chunk.getConflictState() == ConflictState.NEXT_CONFLICTING_RANGE) { // found another conflicting chunk writeConflictChange(chunk); } }
if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { nrOfConflicts++; if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { if (currentConflict > -1) { ret[currentConflict][mergeChunk.getSequenceIndex()] = mergeChunk.getBegin(); if (mergeChunk.getConflictState().equals(ConflictState.NEXT_CONFLICTING_RANGE)) { if (mergeChunk.getEnd() > endOfChunk) endOfChunk = mergeChunk.getEnd();
if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { nrOfConflicts++; if (mergeChunk.getConflictState().equals(ConflictState.FIRST_CONFLICTING_RANGE)) { if (currentConflict > -1) { ret[currentConflict][mergeChunk.getSequenceIndex()] = mergeChunk.getBegin(); if (mergeChunk.getConflictState().equals(ConflictState.NEXT_CONFLICTING_RANGE)) { if (mergeChunk.getEnd() > endOfChunk) endOfChunk = mergeChunk.getEnd();