mirror of https://github.com/k3s-io/k3s
0299a2403f
- 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. |
||
|---|---|---|
| .. | ||
| BUILD | ||
| doc.go | ||
| merge.go | ||
| merge_conflict_test.go | ||
| merge_map_list_test.go | ||
| merge_map_test.go | ||
| merge_primitive_list_test.go | ||
| merge_primitive_test.go | ||
| merge_visitor.go | ||
| replace_map_list_test.go | ||
| replace_map_test.go | ||
| replace_primitive_list_test.go | ||
| replace_visitor.go | ||
| retain_keys_test.go | ||
| retain_keys_visitor.go | ||
| strategic_visitor.go | ||
| suite_test.go | ||
| test_swagger.json | ||
| utils_test.go | ||