[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '

From: Paul Sander
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '
Date: Wed, 18 Jul 2001 00:09:50 -0700

>--- Forwarded mail from address@hidden (Greg Woods):

>[ On Tuesday, July 17, 2001 at 20:48:27 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\   
>> |\|\| '
>> This doesn't address the issue of simplicity of use.  Your steps to put
>> something into CVS is extremely complicated if conflict markers exist.  
>> Either
>> you don't care about this fact, or you're ignoring it.

>Where?  I see no complexity here.  Anyone who used CVS before Kingdon's
>unilateral change had already bought into the notion that CVS detected
>conflict markers and kindly prevented you from cheking them in.

By the same logic, anyone who used CVS after Kingdon's change bought into
the notion that CVS detected conflict markers and kindly warned the user
while checking the files in.

>--- End of forwarded message from address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]