| Chunk |
|---|
| Conflicting content |
|---|
int[] indexes = new int[names.size()];
indexes[0] = 0 + groupCounts.get(0);
for (int i = 1; i < indexes.length; i++) {
<<<<<<< HEAD
indexes[i] = indexes[i - 1] + groupCounts.get(i);
}
=======
indexes[i] = indexes[i - 1] + groupCounts.get(i - 1);
}
>>>>>>> 5f23719ef60fd89c06a1b688bece2cf5f81f8ff1
return indexes;
}
|
| Solution content |
|---|
int[] indexes = new int[names.size()];
indexes[0] = 0 + groupCounts.get(0);
for (int i = 1; i < indexes.length; i++) {
indexes[i] = indexes[i - 1] + groupCounts.get(i);
}
return indexes;
}
|
| File |
|---|
| UriTemplateParser.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Array access |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* Taken from Jersey 1: jersey-tests: com.sun.jersey.impl.uri.UriTemplateTest
*
<<<<<<< HEAD
* @author Paul.Sandoz at Sun.Com
* @author Gerard Davison (gerard.davison at oracle.com)
=======
* @author Paul Sandoz
>>>>>>> 5f23719ef60fd89c06a1b688bece2cf5f81f8ff1
*/
public class UriTemplateTest {
|
| Solution content |
|---|
/**
* Taken from Jersey 1: jersey-tests: com.sun.jersey.impl.uri.UriTemplateTest
*
* @author Paul.Sandoz at Sun.Com
* @author Gerard Davison (gerard.davison at oracle.com)
*/
public class UriTemplateTest {
|
| File |
|---|
| UriTemplateTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |