[tip] Use WinMerge for compare / merge in StarTeam
We use StarTeam for source control at my work. I'm not a huge StarTeam fan, and I think the compare / merge portion is pretty much unusable. Fortunately, you can pick your own alternative merge and compare utilities. I like WinMerge . Here's how to set it up:
1. Tools / Options / File tab.
2. Check "Merge utility"
and "Comparison utility" checkboxes.
3. Browse to
WinMergeU.exe
4. Enter the following for merge utility
options:
/dl "StarTeam Version" /dr "Your Changes" $branchtip
$usertip $resultfile
5. Enter the following for comparison utility
options:
/dl "StarTeam or Older Version" /dr "Your Changes or
Newer Version" $file1 $file2
References:
WinMerge command line info:
http://winmerge.sourceforge.net/2.2/manual/commandline.html
Araxis Merge integration info for various source
control systems:
http://www.araxis.com/merge/scm_integration.html
powered by IMHO 1.2