On Thu, 23 Oct 2003 12:13:17 +0100, "James Wilkinson" <james at kudosdigital.com> wrote: >Yes, what, or where, is an 'Automated Conflict Parser' ? > The only one I've used is CVS Conflict Editor: http://sourceforge.net/projects/conflicteditor/ IIRC if you update using Tortoise it automatically invokes it on files that have conflicts. Tony