On Mon, 22 Oct 2007 08:35:52 +0200 Melchior FRANZ <[EMAIL PROTECTED]> wrote:
> * Syd&Sandy -- Monday 22 October 2007: > <<<<<<< > > // LessThan predicate for bucket pointers. > > static bool lessThan(bucket *a, bucket *b); > > ======= > > static bool lessThan(bucket *a, bucket *b); > > >>>>>>> 1.25.2.4 > > }; > > > > Anyone else getting errors like this ? > > No, those are only for you. :-) These are "merge conflict > markers" inserted by CVS to show you where you have to > resolve a conflict by hand, because CVS failed to do so. > They were chosen such that they don't make sense in any > programming language, so that they will in any case cause > an error. svn and git use them, too. > > Conflicts happen when you modified your local copy, then > make a "cvs up", and cvs notices that it would have to > overwrite your local changes, which it refuses. It puts > the marker like so: > > <<<<<<< > your modifications > ======= > the code that cvs would like to insert from the repository > >>>>>>> 1.2.3.4 ... in this revision > > You have then to merge the two halves by hand, often by > just dropping your modifications or rejecting the new > code. > > m. > Well , I learn something new every day :) I am puzzled though , I never touched those files .... at least , not that I remember .... Thanks for the help .... I'll try a fresh update . -- Syd&Sandy <[EMAIL PROTECTED]> ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Flightgear-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-devel
