configure broken?

[Oliver Sampson]

On Sat, 15 Dec 2001 14:35:28 +0100, Marcus Meissner
<marcus at jet.franken.de> wrote:

>On Sat, Dec 15, 2001 at 01:02:35PM +0100, Oliver Sampson wrote:
>> Howdy,
>> I just tried to update my CVS version and I get the following:
>> 
>> checking size of long long... ./configure: line 6355: syntax error
>> near unexpected token `<<<<<'
>> ./configure: line 6355: `<<<<<<< configure'
>> 
>> Really, all is did was type 'cvs update' :-)
>
>This is just a merge conflict. Either do
>	rm configure ; cvs update configure
>or just:
>	autoconf
>if you have autoconf installed.
>
>Ciao, Marcus
>
>

Thanks!   How does one know that it was this type of problem, as
opposed to another type of problem?  


====================================================
Oliver Sampson                  
olsam at quickaudio.com
http://www.oliversampson.com