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.
> IIRC if you update using Tortoise it automatically invokes it on files > that have conflicts. TortoiseCVS does. When I get conflicts, it invoked my merge utility (I use WinMerge) and allows me to immediately correct the conflict then it gives me the option to save or discard any changes I made before saving the resulting file to the sandbox. Perhaps the WinCVS developers could add something like that. It does this in succession for each "C" I get while merging (updating too, IIRC, but that happens very rarely). Also, when a file has a conflict, Tortoise will mark it with a conflict overlay icon and add a "Resolve Conflicts" item to that file's context menu so you can re-invoke that merge resolution later. Regards, Glen Starrett