|Re: [mdt-papyrus.dev] Demo of Papyrus Model Repository with CDO posted|
Yes, I think that would be the primary focus for a more complete conflict resolution strategy. CDO includes some support for computing matches according to the EMF Compare 2.x API, and also branching and merging object histories in a repository. Currently, though, none of that is in the scope of the initial implementation of CDO in Papyrus in this Kepler release.
CDO does provide a conflict resolver that hooks into a transaction to resolve conflicts automatically by merging changes committed to individual features by remote transactions. This is something that I need to evaluate as a means to help reduce the number of conflicts that are presented to users in the first place.
On 2013-02-19, at 11:17 AM, GERARD Sebastien 166342 <Sebastien.GERARD@xxxxxx> wrote:
Back to the top