github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,889 Commits 1 Branch 31 Tags 1,019 MiB
fd9e9b01b1
Commit Graph

2 Commits

Author SHA1 Message Date
Jordan Liggitt
fd9e9b01b1 Remove uses of extensions/v1beta1 clients 2018-12-19 11:18:53 -05:00
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