[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: Fri, 20 Jul 2001 11:40:08 -0400

>[ On Friday, July 20, 2001 at 07:02:05 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>>
|^\|\|\|\|\\|\| '
>> I think you're missing the point.  Let's say you get some code from a vendor
>> that contains CVS conflict markers and you want to put them on a vendor
>> what do you do?
>Well Noel, I'll repeat my answer, yet again, just for you.
>You do nothing until you have to change the file in question.  Then
>before you commit it you do whatever's necessary syntactically to hide
>the markers.  That's it.  That's all.  I.e. you do the same thing you'd
>have to do with your own code, except you don't do it until/unless you
>have to change a given vendor file.  Pretty simple, eh?

If you do this, you're not really tracking the differences between what the
vendor gave you and what you've done to the file(s).  Instead, you're munging
two separate change sets into one checkin.


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]