>Hi Mike,
>
>how would you handle this type of scenario using VSS (assuming that's what you use)?

VSS works with text versions of files, using scctext.prg for conversion. Tables (which those so-called binaries actually are) are exported as texts. Scx/sct becomes sca, frx/frt becomes fra etc, AFAI remember. Now it may be possible to merge changes in them, though I haven't seen that done. In all cases where I worked as a member of a telecommuting team, we had ONE version of each, period. I.e. we had the last build, which was running in production, and one version in the works. Never had to go back like what you describe... well, almost never. If a bug was described in a previous major version (in 3.xx for users still using it, though the official version was 4.yy), it was manually applied to the current version. Any automated, or even semiautomated, merge was out of the question, because the major versions were different enough (dbf vs SQL Server).