Forum OpenACS Q&A: Re: CVS merge woes

2: Re: CVS merge woes (response to 1)
Posted by Deds Castillo on
__How do you get rid of old files which no longer exist in the later code, while at the same time retaining custom files which you added to your project in between the two imports? (Or don't you?)__

If you do the import using the same vendor tag, it should automatically remove the files on that branch and retain your own files.  There could be conflicts though for which you need to merge via -j on your CVS.  For a reference on how your files and the vendor files will be interpreted (removed, modified, conflict....) refer to this article -