If a file has conflicts when merging, the original is saved as .#original_name.x where x is the revision number the working copy is based on (I think).
-Damian > From: "Stanton, Curt (NCI/IMS)" <[EMAIL PROTECTED]> > To: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]> > Subject: Is there anyway to not change a file when there are conflicts? > Date: Wed, 9 Jan 2002 11:23:03 -0500 > 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