To use merging, you must have a merge tool. To define the merge command line CrossWorks generates, choose Tools > Options > Source Control > Merge Command Line. The command line is defined as a list of strings to avoid problems with spaces in arguments. The merge command line can contain the following macros:

To merge the file in the project and the version checked into source control:
  1. In the Project Explorer, right-click the file node.
  2. Choose Source Control > Merge.

When the external tool has finished, if $(commonfile) has been modified, you will be asked if you want to overwrite the file in the project with $(commonfile).