Skip to content

K
k3s
Switch branch/tag
History Find file
  • fanzhangio's avatar
    Add conflict detection feature to apply strategy · 0299a240
    fanzhangio authored 
    - 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.
    0299a240
Name
Last commit
 Last update
..
BUILD Loading commit data...
doc.go Loading commit data...
merge.go Loading commit data...
merge_conflict_test.go Loading commit data...
merge_map_list_test.go Loading commit data...
merge_map_test.go Loading commit data...
merge_primitive_list_test.go Loading commit data...
merge_primitive_test.go Loading commit data...
merge_visitor.go Loading commit data...
replace_map_list_test.go Loading commit data...
replace_map_test.go Loading commit data...
replace_primitive_list_test.go Loading commit data...
replace_visitor.go Loading commit data...
retain_keys_test.go Loading commit data...
retain_keys_visitor.go Loading commit data...
strategic_visitor.go Loading commit data...
suite_test.go Loading commit data...
test_swagger.json Loading commit data...
utils_test.go Loading commit data...