Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Oliver Giesen wrote: > done on the client side, i.e. I don't think the client is first sending > the local files to the server in order to let it merge them and then > send the results back... Actually it does... If you update, and you've modified a file, that file gets sent to the server, which does a 3-way merge on it and sends a patch (plus checksum) to the client. The client is *really* dumb... that's partly why it's so easy to add features on the server side :) Tony -- Te audire no possum. Musa sapientum fixa est in aure. Tony Hoyle <tmh at nodomain.org> Key ID: 104D/4F4B6917 2003-09-13 Fingerprint: 063C AFB4 3026 F724 0AA2 02B8 E547 470E 4F4B 6917