Eclipse Community Forums: EMF » [CDO] conflict merge

Help

Home

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

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

[CDO] conflict merge [message #1853087]

Fri, 17 June 2022 06:43

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

Previous Topic:	[CDO] Issue with closing view
Next Topic:	[CDO]Error while prefetch lock state

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 26 06:47:04 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter