Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
EMF Compare/Specifications/AllNonConflictingActions
All Non-Conflicting Actions
The following table shows the actual state of a model after clicking on EMF Compare comparison editor toolbar's buttons:
| 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 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 3-way | Left delete | X | / | X | RIGHT = / | LEFT = X | MARK AS MERGED | LEFT = X | RIGHT = / | DO NOTHING | DO NOTHING | DO NOTHING |
| Right delete | X | X | / | RIGHT = X | LEFT = / | LEFT = / | MARK AS MERGED | DO NOTHING | LEFT = / | LEFT = / | LEFT = / | |
| Left Add | / | X | / | RIGHT = X | LEFT = / | MARK AS MERGED | LEFT = / | RIGHT = / | DO NOTHING | DO NOTHING | DO NOTHING | |
| Right Add | / | / | X | RIGHT = / | LEFT = X | LEFT = X | MARK AS MERGED | DO NOTHING | LEFT = X | LEFT = X | LEFT = X | |
| 2-way | Delete | / | X | RIGHT = / | LEFT = X | NOT TESTED | NOT TESTED | RIGHT = - | LEFT = X | NOT TESTED | NOT TESTED | |
| 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 after clicking on EMF Compare comparison editor toolbar's buttons:
| 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 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 3-way | Left delete | X | / | X | RIGHT = / | LEFT = X | MARK AS MERGED | LEFT = X | RIGHT = / | DO NOTHING | MARK AS MERGED | LEFT = X |
| Right delete | X | X | / | RIGHT = X | LEFT = / | LEFT = / | MARK AS MERGED | DO NOTHING | LEFT = / | LEFT = / | MARK AS MERGED | |
| Left Add | / | X | / | RIGHT = X | LEFT = / | MARK AS MERGED | LEFT = / | RIGHT = / | DO NOTHING | MARK AS MERGED | LEFT = / | |
| Right Add | / | / | X | RIGHT = / | LEFT = X | LEFT = X | MAM | DO NOTHING | LEFT = X | LEFT = X | MARK AS MERGED | |
| 2-way | Delete | / | X | RIGHT = / | LEFT = X | NOT TESTED | NOT TESTED | RIGHT = - | LEFT = X | NOT TESTED | NOT TESTED | |
| Add | X | / | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED | RIGHT = X | LEFT = / | NOT TESTED | NOT TESTED |