| Chunk |
|---|
| Conflicting content |
|---|
return sortByNumericValue(calculator).first();
}
<<<<<<< HEAD
private Element safeGet(int index) {
=======
@Override
public String join(String combiner) {
StringBuilder joined = new StringBuilder();
for (int i = 0, size = size(); i < size; i++) {
joined.append(get(i));
if (i < size - 1)
joined.append(combiner);
}
return joined.toString();
}
private void ensureNotEmpty() {
>>>>>>> 8541f310500c82511a3a4cd157ff252d94a3224c
if (isEmpty())
throw new ListWasEmptyException();
|
| Solution content |
|---|
return sortByNumericValue(calculator).first();
}
@Override
public String join(String combiner) {
StringBuilder joined = new StringBuilder();
for (int i = 0, size = size(); i < size; i++) {
joined.append(get(i));
if (i < size - 1)
joined.append(combiner);
}
return joined.toString();
}
private Element safeGet(int index) {
if (isEmpty())
throw new ListWasEmptyException();
|
| File |
|---|
| DynamicArrayList.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Method signature |