Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF » [CDO] How to merge 2 repos that have diverged(2 repos with a common base have been developed independently, how to merge them.)
[CDO] How to merge 2 repos that have diverged [message #1403367] Wed, 23 July 2014 09:46 Go to next message
David Wynter is currently offline David WynterFriend
Messages: 4624
Registered: July 2009
Senior Member
Hi,

Does anyone have some guidance on how to merge two CDO repositories that have diverged. Both started from the same repository and were developed further in isolation on separate laptops. There are no overlapping model elements in these repos apart from the original model elements that were there prior to them being developed in isolation from each other.

Re: [CDO] How to merge 2 repos that have diverged [message #1403380 is a reply to message #1403367] Wed, 23 July 2014 11:12 Go to previous message
Eike Stepper is currently offline Eike StepperFriend
Messages: 6441
Registered: July 2009
Senior Member
Hi David,

CDO's built-in merging only supports merging between branches of the same repository. I guess you can merge the
respective latest versions of two corresponding branches from the diverged repos with EMF Compare or EMF DiffMerge. But
I don't foresee all possible complications.

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper



Am 23.07.2014 11:46, schrieb David Wynter:
> Hi,
>
> Does anyone have some guidance on how to merge two CDO repositories that have diverged. Both started from the same
> repository and were developed further in isolation on separate laptops. There are no overlapping model elements in
> these repos apart from the original model elements that were there prior to them being developed in isolation from
> each other.
>
>


Previous Topic:[CDO] Add content of XMI file to existing CDO resource - too slow
Next Topic:[XCORE] Ugly Performance Problems
Goto Forum:
  


Current Time: Tue Aug 20 22:25:58 GMT 2019

Powered by FUDForum. Page generated in 0.01533 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top