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

[Paul Sander]

>--- Forwarded mail from address@hidden


>>[ On Wednesday, July 18, 2001 at 15:56:51 (-0700), Paul Sander wrote: ]
>>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>>
>|^\|\|\|\|\|\|\| '
>>>
>>> Perhaps, but getting the vendor to accept the change and put it into their
>>> own distribution for their next drop is another story.
>>
>>That's also not relevant to this discussion.  Who cares?  Who's even to
>>say that you're even going to try to send any changes back to the
>>vendor?  This is not a CVS issue in any way shape or form!!!!!

>Are you saying that CVS will somehow (in yet an undisclosed manner) detect
>vendor branches and allow the checkin when there are conflict markers?  Or are
>you saying that stuff checked into vendor branches may not really be what the
>vendor gave you to begin with?

Or that you really don't want the vendor's code?

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