[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: Mon, 16 Jul 2001 18:25:00 -0400

>[ On Monday, July 16, 2001 at 16:53:41 (-0400), Noel L Yap wrote: ]
>> Subject: Re: Conflict marker detection debate (Was: How well does CVS
handle other types of data?)
>> It's up to the user and processes to make such verifications.
>No, it's not.  CVS must assure that conflicts it introduces during a
>merge have been resolved.  It can easily do so.  The user's
>responsibility is only to do the conflict resolution.

The problem is that it can't know with certainty whether it or the user (whether
manually through an editor or through some other tool) introduced the markers.

Noone but you has complained about its current behaviour.  You didn't even
notice it until you were told about it.


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]