Eclipse Community Forums: EMF Parsley

Help

Home

Home » Modeling » EMF Parsley » [CDO] conflict merge(How to merge conflicts manually)

Show: Today's Messages :: Show Polls :: Message Navigator

[CDO] conflict merge [message #1853080]

Fri, 17 June 2022 01:53

fang li

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.

Report message to a moderator