1 Commits (c582a37cae02b4d1a850e6668ea8ea0a81dcd204)

Author	SHA1	Message	Date
fanzhangio	0299a2403f	Add conflict detection feature to apply strategy ... - Add DetectConflictor interface on Element level. Implemented it for particular elements. - If Options.FailOnConflict is enabled, Merge will detect conflict by invoking doConflictDecect for particular element, returning ConflictError with details. - Add tests, including use case examples and illustration. For example: list, map, and complicated combination.	2018-03-23 01:56:20 -07:00