Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF Parsley » [CDO] conflict merge(How to merge conflicts manually)
[CDO] conflict merge [message #1853080] Fri, 17 June 2022 01:53 Go to next message
fang li is currently offline fang liFriend
Messages: 5
Registered: April 2022
Junior Member
Hi,

I open two different transaction A and B, and edit the same model (using CDO Sessions view).
The model name was 123.
Transaction A change the name to 321,and don't commit.
Transaction B change the name to 456,and commit.

When I try to commit transaction A, it says has conflicts and need to roll back.
And I try to use the 'Merge Conflicts' Action, but it doesn't work.


I check the CDOMergingConflictResolver, it can't resolve this kind of conflict.

how can I merge the conflicts manually, just like git that I can compare and edit the conflicts and decide the final result and commit.



Re: [CDO] conflict merge [message #1853085 is a reply to message #1853080] Fri, 17 June 2022 06:22 Go to previous message
Lorenzo Bettini is currently offline Lorenzo BettiniFriend
Messages: 1798
Registered: July 2009
Location: Firenze, Italy
Senior Member
Hi

I guess this is a question specific of CDO, not of EMF Parsley...


Previous Topic:CDO View with Branching
Goto Forum:
  


Current Time: Sat Nov 26 13:46:56 GMT 2022

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

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

Back to the top