Projects >> elasticsearch >>1915c74e93e13f1b9e755cfdda0343b1475577ee

Chunk
Conflicting content 
            out.writeOptionalString(indexedShapePath);
        }
        relation.writeTo(out);
<<<<<<< HEAD
        boolean hasStrategy = strategy != null;
        out.writeBoolean(hasStrategy);
        if (hasStrategy) {
=======
        if (strategy == null) {
            out.writeBoolean(false);
        } else {
            out.writeBoolean(true);
>>>>>>> a798f4f711d1921755596004d7cd1904c5dcddaf
            strategy.writeTo(out);
        }
    }
Solution content 
            out.writeOptionalString(indexedShapePath);
        }
        relation.writeTo(out);
        if (strategy == null) {
            out.writeBoolean(false);
        } else {
            out.writeBoolean(true);
            strategy.writeTo(out);
        }
    }
File
GeoShapeQueryBuilder.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Variable