| Chunk |
|---|
| Conflicting content |
|---|
} else if (force) {
existing.updateFrom(book);
fireBookEvent(BookEvent.Updated, existing);
<<<<<<< HEAD
getBookById(book.getId());
=======
>>>>>>> d08131d68b8f9380a752a26a80e96ad06791a530
}
}
} |
| Solution content |
|---|
} else if (force) {
existing.updateFrom(book);
fireBookEvent(BookEvent.Updated, existing);
}
}
} |
| File |
|---|
| BookCollection.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |