Projects >> elasticsearch >>345a30a2a725af3b53ca1d476a1361baa367b2af

Chunk
Conflicting content 
                "jvm", "true",
                "classname", "FakePlugin");

<<<<<<< HEAD
        assertStatusOk(String.format(Locale.ROOT, "install %s --url %s --verbose", pluginName, pluginUrl));
=======
        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
>>>>>>> 833f821171fa2a613fffe3d1964f9b0e2545266b

        assertFileContent(pluginConfigDir, "test.txt", "version1");
        assertFileContent(pluginConfigDir, "test.txt.new", "version2");
Solution content 
                "jvm", "true",
                "classname", "FakePlugin");

        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));

        assertFileContent(pluginConfigDir, "test.txt", "version1");
        assertFileContent(pluginConfigDir, "test.txt.new", "version2");
File
PluginManagerIT.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryBuilders;
<<<<<<< HEAD
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.plugins.AbstractPlugin;
=======
import org.elasticsearch.index.query.QueryParsingException;
import org.elasticsearch.plugins.Plugin;
>>>>>>> 833f821171fa2a613fffe3d1964f9b0e2545266b
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptModule;
import org.elasticsearch.script.ScriptService;
Solution content 
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptModule;
import org.elasticsearch.script.ScriptService;
File
SignificantTermsSignificanceScoreIT.java
Developer's decision
Combination
Kind of conflict
Import