begin quoting John_brd <[EMAIL PROTECTED]> : > > Hi, > I have two directories , SRC and SRC_new on same branch, SRC_new contaings > all files which are in SRC and some new files . > > How can I merged SRC_new to SRC ?
Initial off-the-cuff thought: Branch again. Move files from SRC_new to SRC. Merge back in branch. Resolve conflicts. Remember to make a branch and not just a new directory in the future. > Hope to get quick reply as I have to give solution ASAP.. I am new to CVS > but with good knowledge of ClearCase and Perforce. IIRC, both CC and Perforce allow for arbitrary merges. I think you'd need a third-party merge tool to do that with CVS. -- ----------------------------------------------------------------------------- "Whed you're oder, you dake your sinuses fo | [EMAIL PROTECTED] granded." -Calvin (_Calvin & Hobbes_) | Stewart Stremler _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
