Re: Provide Common Ancestor To ConflictHandler

2017-02-06 Thread Michael Dürig
Hi, I bumped the fix version to 1.8 for increased visibility during the next release cycle. Any chance you could kick this off from your side with a patch? Michael On 31.1.17 1:11 , Dominique Jaeggi wrote: Hi team I wanted to inquire whether the persistence team would be interested to put

Provide Common Ancestor To ConflictHandler

2017-01-31 Thread Dominique Jaeggi
Hi team I wanted to inquire whether the persistence team would be interested to put [0] on the road map. Next to preventing regularly occurring merge issues in production, specifically in the user group membership area, I am sure oak would benefit as a whole from featuring three way merges. Gree