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

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

[CDO] Using conflict resolver [message #1366176]

Mon, 19 May 2014 03:32

Eclipse User

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.

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

Sat, 05 July 2014 17:06

Eclipse User

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.

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

Fri, 03 October 2014 07:51

Eclipse User

Thank you Bernard.

Previous Topic:	how create CDO branches
Next Topic:	[Texo] generating a default value for an attribute

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Jul 26 11:29:47 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter