Bug 258863 - Provide common conflict/merge model
Summary: Provide common conflict/merge model
Status: CLOSED DUPLICATE of bug 270716
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.2   Edit
Hardware: All All
: P5 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted
Depends on:
Blocks: 257372 257803
  Show dependency tree
 
Reported: 2008-12-15 16:07 EST by Eike Stepper CLA
Modified: 2013-06-27 04:00 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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