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. Thanks in advance
Curt Stanton IMS Inc. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
