/** * Returns {@code true} if there's a conflict in merging the two features. * <p> * A conflict can happen if the feature types are incompatible or both changed the same * feature attribute with different values. * * @return {@code true} if the features can't be merged due to a conflict. */ public boolean isConflict() { if (mergeIntoDiff.conflicts(toMergeDiff)) { return true; } if (!featureTypesMatch()) { return true; } return false; }
/** * Returns {@code true} if there's a conflict in merging the two features. * <p> * A conflict can happen if the feature types are incompatible or both changed the same * feature attribute with different values. * * @return {@code true} if the features can't be merged due to a conflict. */ public boolean isConflict() { if (mergeIntoDiff.conflicts(toMergeDiff)) { return true; } if (!featureTypesMatch()) { return true; } return false; }