Eclipse Community Forums: EMF » [CDO] Using conflict resolver

Help

Home

Home » Modeling » EMF » [CDO] Using conflict resolver

Show: Today's Messages :: Show Polls :: Message Navigator

[CDO] Using conflict resolver [message #1366176]

Mon, 19 May 2014 07:32

Aleksander

Messages: 44
Registered: May 2014
Location: France

Member

Hello all,

I'm having trouble using any sort of ConflictResolver, I've started to use the AbstractObjectConflictResolver.ThreeWayMerge but I don't know what I'm expected to write in the "resolveConflict(CDOObject arg0, CDORevisionDelta arg1, List<CDORevisionDelta> arg2)" method. I'm having trouble finding any guideline for that, because I really don't know how to use the CDORevisionDelta object.

If you can point me to an snippet or, even better a tutorial, it would be great.

Thank you.

Report message to a moderator

Re: [CDO] Using conflict resolver [message #1394745 is a reply to message #1366176]

Sat, 05 July 2014 21:06

Bernard Sarter

Messages: 88
Registered: August 2011
Location: Paris, France

Member

Hello,

You can find an example here: https://github.com/eclipse/cdo/blob/master/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java

It shows how to use CDOMergingConflictResolver, which works 'out of the box' and where you have nothing to implement to solve simple conflicts.

HTH,
Bernard.

Report message to a moderator