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

Bug 258863

Summary: Provide common conflict/merge model
Product: [Modeling] EMF Reporter: Eike Stepper <stepper>
Component: cdo.coreAssignee: Project Inbox <emf.cdo-inbox>
Status: CLOSED DUPLICATE QA Contact:
Severity: enhancement    
Priority: P5 CC: lu.xingxiao
Version: 4.2Keywords: helpwanted
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:
Bug Depends on:    
Bug Blocks: 257372, 257803    

Description Eike Stepper CLA 2008-12-15 16:07:18 EST
Comment 1 Eike Stepper CLA 2009-11-01 05:58:19 EST 
Rebasing all unresolved enhancement requests to 3.0
Comment 2 Eike Stepper CLA 2010-06-29 04:50:02 EDT 
Rebasing all outstanding enhancements requests to version 4.0
Comment 3 Eike Stepper CLA 2011-06-23 03:56:53 EDT 
Moving all open enhancement requests to 4.1
Comment 4 Eike Stepper CLA 2012-08-14 22:55:02 EDT 
Moving all open issues to 4.2. Open bugs can be ported to 4.1 maintenance after they've been fixed in master.
Comment 5 Eike Stepper CLA 2012-12-30 12:22:49 EST 
Merge support has been added with bug 270716.

*** This bug has been marked as a duplicate of bug 270716 ***
Comment 6 Eike Stepper CLA 2013-06-27 04:00:36 EDT 
Closing