Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
EMF Compare/Specifications/AllNonConflictingActions
< EMF Compare
Revision as of 12:07, 20 May 2015 by Axel.richard.obeo.fr (Talk | contribs) (Created page with "= All Non-Conflicting Actions = {| border="1" cellpadding="10" cellspacing="0" align="center" !What is !CHANGE !ANCESTOR !LEFT !RIGHT !LEFT to RIGHT !RIGHT to LEFT !ACCEPT !R...")
All Non-Conflicting Actions
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 |
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 |