Projects >> elasticsearch >>e6f9cbce8f76096ea7366922e731cc9e93fb83b9

Chunk
Conflicting content 
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
<<<<<<< HEAD
import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorFactory;
=======
import org.elasticsearch.search.rescore.RescoreBuilder.Rescorer;
>>>>>>> 3d98756e64784652b81b9db2680bbde5295922e0
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
Solution content 
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.search.rescore.RescoreBuilder.Rescorer;
import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorFactory;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
File
StreamInput.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
<<<<<<< HEAD
import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorFactory;
=======
import org.elasticsearch.search.rescore.RescoreBuilder.Rescorer;
>>>>>>> 3d98756e64784652b81b9db2680bbde5295922e0
import org.joda.time.ReadableInstant;

import java.io.EOFException;
Solution content 
import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.search.rescore.RescoreBuilder.Rescorer;
import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorFactory;
import org.joda.time.ReadableInstant;

import java.io.EOFException;
File
StreamOutput.java
Developer's decision
Concatenation
Kind of conflict
Import