Compare and merge models in a team environment

This tutorial illustrates how to compare and merge models in a team environment by showing the workflow of two users who work in parallel on the same modeling project.

This tutorial applies to any configuration management system that supports the comparing and merging of models; however, this tutorial uses IBM Rational® ClearCase®.

Learning objectives

This tutorial shows you how to do the following things:

  • Rebase a workspace to the latest baseline
  • Check out a model file
  • Create an activity to modify a model file
  • Check in a model file
  • Deliver work to an integration stream
  • Start a compare and merge session
  • View differences and conflicts between contributor and ancestor files
  • View details about each difference and conflict in a compare and merge session
  • View, accept, or reject individual differences from a left contributor
  • View, accept, or reject individual differences from a right contributor
  • View and save a merged model
  • Close a compare and merge session

This tutorial plays in a video format, which you can operate through playback controls. You can pause, advance, or reverse the tutorial at any time by using the control bar at the bottom of the screen.

Time   6 minutes and 46 seconds
Start   Start the tutorial