::slaps heel of hand to forehead:: That's what comes of being the CVS administrator *and* a programmer: I kept thinking it was a problem for administrator-me. Thank you.
On Thursday, October 09, 2003 4:21 PM, Larry Jones [SMTP:[EMAIL PROTECTED] wrote: > Andy Jones writes: > > > > So when I went to commit the files back in my local working copy I got > > "<filename> created independantly by second party". I couldn't merge away > > the conflict. In the end I just cvs remove'd the version from the import. > > > > My question is, was there a better, cleaner way out of that conflict? > > Temporarily rename your local file; do a "cvs rm" on the original name > to "unadd" it; update to get the file from the repository; check to be > sure that you really want your local file instead; then rename your > local file back, replacing the one you just got. > > > Shouldn't a cvs update have merged the differences between the two > > versions? > > As far as CVS knows, the two file have nothing whatsoever to do with > each other. Without a common ancestor, there's nothing to merge -- > you'd just have one big conflict with the entire contents of both files, > so there's no point in even trying. > > -Larry Jones > > Hello, local Navy recruitment office? Yes, this is an emergency... -- Calvin _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
