BTMerge - Screencasts
Please find the screencasts demonstrating the use of our BTMerge tool below:
- Installation: Demonstrates how to install BTMerge into a clean Eclipse Modeling Juno distribution.
- Retrieving the Example: Shows how to import the running example and how to switch to the BTMerge perspective.
- Example: Guides through the running example and shows how conflicts are resolved incrementally.
- Preferences: Shows the BTMerge preference pages, including default resolution strategies.
Home Automation System example
This is a larger example based on the Eclipse UML2 metamodel:
- Applying Concurrent Modifications: Creation of two alternative model versions.
- Merging: Demonstrates the three-way merge performed on the Home Automation System versions.
- Result: Shows the merge result.
Merging of Ordered Collections
The following examples demonstrate the graph-based three-way merging algorithm for ordered collections in EMF models:
- Example A: Conflicting insertions and moves.
- Example B: Conflicting cyclic moves.
- Example C: Non-conflicting interacting moves.