On 21/03/2016 20:03, Stefan Egli wrote: > Hi oak-devs, > > tl.dr: suggestion is to introduce a new property (or mixin) that enables > async merge for a subtree in a cluster case while at the same time > pre-defines conflict resolution, since conflicts currently prevent > trouble-free async merging. > ...
Overall I like the idea as it leaves to the repository creator the ability to define such behaviours. I'd go for the mixin, with a default chain/order of conflict resolution and allow to define such in a multivalue property. So that in case needed the user can define its own chain of conflict resolution, or even custom one if needed. Davide
