On Sun, 2002-03-31 at 12:28, Keith Wiley wrote: > > If any files in the archive have changed since your last update, cvs > > will attempt to merge the changes into your local tree. It will attempt > > to do this even if you've made local mods. If it can't merge the > > changes, it will mark the offending section of each file accordingly > > and then you'll need to edit them by hand to resolve the conflicts. > > When you say "merge into tree" does that mean the cvs update should be > rewriting or otherwise modifying my existing personally-modified file,
Yes. CVS will attempt to incorporate both sets of changes (those in the repository and your local ones) into your local copy of the file. If it can't, it will generate a conflict. or > does merge not mean that files are merged together but more that a > separate code tree branches off and the new files reside elsewhere (and my > modified personally-modified version of the file stays the same)? > > ________________________________________________________________________ > Keith Wiley [EMAIL PROTECTED] > http://www.unm.edu/~keithw http://www.mp3.com/KeithWiley > > "Yet mark his perfect self-contentment, and hence learn his lesson, > that to be self-contented is to be vile and ignorant, and that to > aspire is better than to be blindly and impotently happy." > -- Edwin A. Abbott, Flatland > ________________________________________________________________________ > > > _______________________________________________ > Flightgear-devel mailing list > [EMAIL PROTECTED] > http://mail.flightgear.org/mailman/listinfo/flightgear-devel -- Tony Peden [EMAIL PROTECTED] We all know Linux is great ... it does infinite loops in 5 seconds. -- attributed to Linus Torvalds _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
