SOS 4.0 Merging

mnacey · Post by **mnacey** » Thu May 27, 2004 1:16 pm

I am a little confused about the merging in SOS. I am looking for a way to perform the VSS "Merge Branches" command, but I can't seem to figure it out.

The "merging" in SOS appears to all be local version to server version merging. Is this correct?

lbauer · Post by **lbauer** » Thu May 27, 2004 2:20 pm

SOS does not support merge branches at this time. It is logged as a feature request for a future version.

SOS 4.0 does support file merge on Get, plus 3-way merge.