Bennett Helm wrote: > The lines around that are: > > # First check the version > > <<<<<<< .mine > echo "configuring LyX version" 1.4.0svn > if echo 1.4.0svn | grep 'cvs' >/dev/null ; then > ======= > echo "configuring LyX version" 1.4.0svn > if echo 1.4.0svn | grep 'svn' >/dev/null ; then > >>>>>>> .r13225 > lyx_devel_version=yes > > (Similar patterns occur about 5 more times.)
These are conflict markers. svn creates them if you update a file with local modifications and the update touches the same parts where the modifications are. You have to resolve them by hand (delete the <<<<<<<, ======= and >>>>>>> lines and choose whatever is appropriate from the lines inbetween. My observations are that svn is not as good as cvs in conflict resolving, i.e. I get more often something like <<<<<<< .mine bla ======= bla >>>>>>> .r13225 which obviously is not really a conflict, but rather a change that was already in my local copy. Georg
