Hi Tom,
The merge can't be done on VCXs, SCXs, and the like. I haven't merged prgs either--so I know nothing of that. For SourceSafe Boost see: http://www.eps-software.com/isapi/eps.dll?Products~DSC+SourceSafe+Boost+1.0
It creates a text file that can be compared. You can do a merge manually by comparing the changes. I always checkin and out sets like Data.VCX, Data.VCT, Data.VCA. The VCA gives me a way to compare.
Steven Black is one who recomends using the VSS interface directly. With a big project the integrated setup is way too slow.

>Hi Charlie,
>
>It's been my understanding (and please correct me if I'm wrong) that the branch/merge functionality cannot be used with VFP because of the binary files (VCX's, FRX's, etc). We have the same problem as Ken and have been hesitant to create a branch if we weren't able to put them back together again (merge).
>
>Our situations are about the same. We use VFP 6.0, VSS 6.0 (SP4, I didn't go to SP5 yet, is there a distinct advantage for VFP/VSS users?) using SourceOffsite for remote developers v3.01. Our SourceOffsite users developers use the VFP Project manager but it takes at least 5 minutes to fully open the project because of SourceOffsite updating/refreshing the directories.
>
>Also do you (and anybody else) primarily use the VSS interface and not the VFP project manager?
>
>
>Thanks,
>
>Tom
>
>P.S. That's the 1st time I've heard of SourceSafe Boost.
>
>>Hi Ken,
>>I haven't had your exact scenario, but I have played with VSS as if I did. The Help file goes through your exact situation. "Share, Pin and Branch to Create Service Pack Projects (Bug Fixes)" The main problem is that any changes to version 3.1 must be merged back into your 4.0 code. That seems unavoidable. We are using VSS 6 with the latest service pack and the sharing, etc., does work as advertised. We use SourceOffSite, and Markus Egger's SourceSafe Boost as well. The one thing we would like is a better way to compare classes, either PRG or VCX based, over time. This is possible by writting a tool in VFP itself, but it hasn't been done yet. <s>
>>
>>>Hi,
>>>
>>>I'd like to accomplish the following, and think some combiantion of share/pin/branch will do it. Can someone who is experienced with working on multiple versions at once point me in the right direction here?
>>>
>>>What I'd LIKE to have happen is this:
>>>
>>>Say we just released version 3.0 of our product. I now want to work on version 3.1 and 4.0 at the same time. Changes made to 3.1 should also go into 4.0. Changes made specifically to 4.0 should NOT go into 3.1. What is the best way to accomplish this in source safe?
>>>
>>>Thanks!