Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 334752

Summary: Deprecate AbstractObjectConflictResolver in favour of CDOMergingConflictResolver
Product: [Modeling] EMF Reporter: Caspar D. <caspar_d>
Component: cdo.coreAssignee: Eike Stepper <stepper>
Status: CLOSED FIXED QA Contact: Eike Stepper <stepper>
Severity: normal    
Priority: P3 CC: stepper
Version: 4.0Keywords: noteworthy
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:

Description Caspar D. CLA 2011-01-19 05:15:56 EST
As discussed on Skype, at least TakeRemoteChangesThenApplyLocalChanges
should be removed, cause its approach to conflict resolution is
fundamentally incorrect.
Comment 1 Eike Stepper CLA 2011-01-25 14:02:11 EST
AbstractObjectConflictResolver has now been deprecated in bug 335080
Comment 2 Eike Stepper CLA 2011-06-23 03:42:24 EDT
Available in R20110608-1407