View source for EMF Compare/Specifications/AllNonConflictingActions

= All Non-Conflicting Actions =

The following table shows what is currently the state (before https://git.eclipse.org/r/#/c/48436/) of a model after clicking on EMF Compare comparison editor toolbar's buttons:

{| border="1" cellpadding="10" cellspacing="0" align="center"
!What is
!CHANGE
!ANCESTOR
!LEFT
!RIGHT
!LEFT to RIGHT
!RIGHT to LEFT
!ACCEPT
!REJECT
!ALL LEFT to RIGHT
!ALL RIGHT to LEFT
!ACCEPT ALL
!REJECT ALL
|- align="center"
|3-way
|Left delete
|X
|/
|X
|RIGHT = /
|LEFT = X
|MARK AS MERGED
|LEFT = X
|RIGHT = /
|DO NOTHING
|DO NOTHING
|DO NOTHING
|- align="center"
|
|Right delete
|X
|X
|/
|RIGHT = X
|LEFT = /
|LEFT = /
|MARK AS MERGED
|DO NOTHING
|LEFT = /
|LEFT = /
|LEFT = /
|- align="center"
|
|Left Add
|/
|X
|/
|RIGHT = X
|LEFT = /
|MARK AS MERGED
|LEFT = /
|RIGHT = X
|DO NOTHING
|DO NOTHING
|DO NOTHING
|- align="center"
|
|Right Add
|/
|/
|X
|RIGHT = /
|LEFT = X
|LEFT = X
|MARK AS MERGED
|DO NOTHING
|LEFT = X
|LEFT = X
|LEFT = X
|- align="center"
|2-way
|Delete
|
|/
|X
|RIGHT = /
|LEFT = X
|NOT TESTED
|NOT TESTED
|RIGHT = /
|LEFT = X
|NOT TESTED
|NOT TESTED
|- align="center"
|
|Add
|
|X
|/
|RIGHT = X
|LEFT = /
|NOT TESTED
|NOT TESTED
|RIGHT = X
|LEFT = /
|NOT TESTED
|NOT TESTED
|}



The following table shows the state the model should be in (and will be after https://git.eclipse.org/r/#/c/48436/) after clicking on EMF Compare comparison editor toolbar's buttons:
(the red cells shows differences between what is and what it should be)

{| border="1" cellpadding="10" cellspacing="0" align="center"
!What it should be
!CHANGE
!ANCESTOR
!LEFT
!RIGHT
!LEFT to RIGHT
!RIGHT to LEFT
!ACCEPT
!REJECT
!ALL LEFT to RIGHT
!ALL RIGHT to LEFT
!ACCEPT ALL
!REJECT ALL
|- align="center"
|3-way
|Left delete
|X
|/
|X
|RIGHT = /
|LEFT = X
|MARK AS MERGED
|LEFT = X
|RIGHT = /
|DO NOTHING
|style="color:red"|MARK AS MERGED
|style="color:red"|LEFT = X
|- align="center"
|
|Right delete
|X
|X
|/
|RIGHT = X
|LEFT = /
|LEFT = /
|MARK AS MERGED
|DO NOTHING
|LEFT = /
|LEFT = /
|style="color:red"|MARK AS MERGED
|- align="center"
|
|Left Add
|/
|X
|/
|RIGHT = X
|LEFT = /
|MARK AS MERGED
|LEFT = /
|RIGHT = X
|DO NOTHING
|style="color:red"|MARK AS MERGED
|style="color:red"|LEFT = /
|- align="center"
|
|Right Add
|/
|/
|X
|RIGHT = /
|LEFT = X
|LEFT = X
|MARK AS MERGED
|DO NOTHING
|LEFT = X
|LEFT = X
|style="color:red"|MARK AS MERGED
|- align="center"
|2-way
|Delete
|
|/
|X
|RIGHT = /
|LEFT = X
|NOT TESTED
|NOT TESTED
|RIGHT = /
|LEFT = X
|NOT TESTED
|NOT TESTED
|- align="center"
|
|Add
|
|X
|/
|RIGHT = X
|LEFT = /
|NOT TESTED
|NOT TESTED
|RIGHT = X
|LEFT = /
|NOT TESTED
|NOT TESTED
|}


[[Category:EMF Compare]]
[[Category:EMF Compare/Specification]]