Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

1) In case the new elements are identical in both models, LemonTree doesn't detect a conflict.(since Release 2.1.3). "New-New" scenarios with same GUIDs can happen if parts of the model are imported via .xmi. 
2) Only a conflict if there is at least one property which is modified in both models.
3) In case the element is moved to the same location in A and B, LemonTree doesn't detect a conflict.

Excerpt Include
Change Types
Change Types
nopaneltrue

...