[Top][All Lists]

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

RE: Conflict marker detection debate

From: Noel L Yap
Subject: RE: Conflict marker detection debate
Date: Tue, 17 Jul 2001 10:00:35 -0400

>The overloading of '-kb' to mean "unmergable" is one aspect where CVS
>suffers.  Fundamentally '-kb' should only affect the handling of line
>separators and EOF indicators on foreign platforms; while '-ko' should
>be used to avoid keyword munging; and some third option should avoid
>merging.  I've suggested that this quality of being "unmergable" should
>be represented as a special RCS "state".

I agree that "-kb" should not be overloaded to mean unmergable.  A new RCS would
be appropriate.


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]