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
..
BUILD	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
doc.go
merge.go
merge_conflict_test.go	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
merge_map_list_test.go	apply/strategy: Improve test performance	2017-10-23 20:29:39 -07:00
merge_map_test.go
merge_primitive_list_test.go
merge_primitive_test.go
merge_visitor.go	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
replace_map_list_test.go
replace_map_test.go	apply/strategy: Improve test performance	2017-10-23 20:29:39 -07:00
replace_primitive_list_test.go
replace_visitor.go	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
retain_keys_test.go	Support retainkeys strategy in new apply merge code	2017-11-02 10:00:56 -07:00
retain_keys_visitor.go	Support retainkeys strategy in new apply merge code	2017-11-02 10:00:56 -07:00
strategic_visitor.go	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
suite_test.go
test_swagger.json	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00
utils_test.go	Add conflict detection feature to apply strategy	2018-03-23 01:56:20 -07:00