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:
$(localfile) The filename of the file in the project.
$(remotefile) The filename of the latest version of the file in source control.
$(commonfile) The filename of the version of the file you originally edited and
the file which will be produced by the merge tool.
$(localname) A display name for $(localfile).
$(remotename) A display name for $(remotefile).
$(commonname) A display name for $(commonfile).
To merge the file in the project and the version checked into source control:
- In the Project Explorer, right-click the file node.
- 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).