On Wed, 2002-01-09 at 16:23, Stanton, Curt (NCI/IMS) wrote: > Here is the problem. When CVS tries to merge a file and fails, it creates > the two different versions of the code snippit seperated by the > >>>>>=====<<<<<. Or somesymbols like that. We find that to be hard to deal > with most of the time. We use another program called beyond compare to > merge the two together. We do this by getting rid of the file it crearted > with those symbols and starting with the working copies modified file and > the newest repo version. My question is. Is there any way to leave the > file as is (in the not updated modified state) and mark it as having a > conflict? We still want it to merge the two if there weren't conflicts.
When CVS merges it creates two files called ".#[original filename].[version] where [version] are the version numbers of the common ancestors. You can merge these two files. Ross -- Ross Burton Software Engineer OneEighty Software Ltd Tel: +44 20 8680 8712 Cygnet House Fax: +44 20 8680 8453 12-14 Sydenham Road [EMAIL PROTECTED] Croydon, Surrey CR9 2ET, UK http://www.180sw.com./ ==================================================================== Under the Regulation of Investigatory Powers (RIP) Act 2000 together with any and all Regulations in force pursuant to the Act OneEighty Software Ltd reserves the right to monitor any or all incoming or outgoing communications as provided for under the Act _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
