2-way merge

[ArthurDigbySellers]

Does BC3 Standard support 2-way merge for TFS?

The directions at http://www.scootersoftware.com/support.php?c=kb_vcs.php imply that 2-way merge is supported, but when I follow the setup I only ever get a Compare instead of Merge.

[Aaron]

Hello,

BC3 Pro is required for the Text Merge session type (2 input panes and an output pane, or 3 input panes and an output pane). BC3 Std only has a Text Compare session type, which is a two file/side by side compare and accepts a /savetarget parameter which can be used. The savetarget changes where the save is output to; so you "merge" you changes to one side then Save to save into the savetarget. It is the same method BC2 used to use when we only supported two sides in the File Viewer.

The Text Merge session type is one of the big Pro features, and if you are registered for Std and would like to try it out, please see this KB article:
http://www.scootersoftware.com/suppo...?zz=kb_evalpro