[Top][All Lists]

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

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

From: Noel L Yap
Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\ |\|\| '
Date: Thu, 19 Jul 2001 15:10:44 -0400

>[ 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?


This communication is for informational purposes only.  It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan Chase & Co., its
subsidiaries and affiliates.

reply via email to

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