Hi, Looking at slides presentations (such as [0]), it seems different conflict resolution are possible between full/partial conflict merge, fully/partially serialized commits.
Is there a comprehensive way to configure each of them or is more a definition of something achievable through a combination of CommitHooks/Editors ? Regards, Timothee [0] http://www.slideshare.net/MichaelDrig/oak-39377061?related=1
