Comparing and merging models

This guide provides a comprehensive approach to comparing and merging models within development environments. It covers the tools and workflows needed to ensure consistent, conflict-free models across file systems, local histories, and configuration management systems (such as ClearCase and Git). The guide also focuses on integration and conflict resolution through both user interfaces and command-line tools.

Learn more about the Compare and Merge feature in DevOps Model RealTime:

Parallel development with configuration systems

Comparing models

Compare user interface

Sub compare

Merging models

Merge user interface

Committing merge results

Resolving conflicts

Text merging

Structural merging by combining models

Manual mappings

Exploring the contributor models