StarTeam Compare and Merge Integration

StarTeam supports integration with third-party Compare and Merge tools. To use Guiffy with StarTeam:
1) Select Tools\Workstation Options from the menu bar. The Workstation Options dialog opens.
2) Select the File Tab...

To integrate Guiffy with StarTeam for Compares:
3) Select the Comparison Utility check box
4) Enter the path of (or browse for) the Guiffy command executable(launcher)
    On Windows, this is the "guiffy.exe" file.
    On Linux or Unix, this is the "guiffy" script file.
5) In the Options text box, add the filename terms:
    $file1 - A place holder for the path to the first file
    $file2 - A place holder for the path to the second file
    Options: $file1 $file2

To integrate Guiffy with StarTeam for Merges:
6) Select the Merge Utility check box
7) Enter the path of (or browse for) the Guiffy command executable(launcher)
    On Windows, this is the "guiffy.exe" file.
    On Linux or Unix, this is the "guiffy" script file.
8) In the Options text box, add the -s option(for Guiffy's 3-way SureMerge).
    And, use the following filename terms:
    $branchtip - A place holder for the path to the tip revision of the file to be merged.
    $usertip - A place holder for the path to the local working file to be merged.
    $basefile - A place holder for the path to the common ancestor for the $branchtip and $usertip files.
    $resultfile - A place holder for the path to the file that will store the output from the merged file.
    Options: -s $branchtip $usertip $basefile $resultfile

Note: The Options text box specifies the Guiffy Command Line parameters. Refer to the Guiffy Command Line Help page for documentation on all of Guiffy's options.

Documentation by Guiffy Software, Inc. 2012