| Chunk |
|---|
| Conflicting content |
|---|
Assert.assertEquals(_interface.getEndpoint(), "localhost:8021");
Assert.assertEquals(_interface.getVersion(), "0.20.2");
<<<<<<< HEAD
Assert.assertEquals(cluster.getLocations().getLocation().get(0)
.getName(), "staging");
Assert.assertEquals(cluster.getLocations().getLocation().get(0)
=======
Assert.assertEquals(cluster.getLocations().get("stagingdir")
.getName(), "stagingdir");
Assert.assertEquals(cluster.getLocations().get("stagingdir")
.getPath(), "/projects/ivory/staging");
>>>>>>> 2d8ac98edaeed3a5c9bfb6ab913efccd967d6ec2
Assert.assertEquals(cluster.getProperties().get("field1") |
| Solution content |
|---|
Assert.assertEquals(_interface.getEndpoint(), "localhost:8021");
Assert.assertEquals(_interface.getVersion(), "0.20.2");
Assert.assertEquals(cluster.getLocations().getLocation().get(0)
.getName(), "staging");
Assert.assertEquals(cluster.getLocations().getLocation().get(0)
.getPath(), "/projects/ivory/staging");
Assert.assertEquals(cluster.getProperties().get("field1") |
| File |
|---|
| ClusterEntityParserTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |