[Top][All Lists]

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

Re: Conflict committed

From: Terrence Enger
Subject: Re: Conflict committed
Date: Wed, 29 Oct 2003 12:38:18 -0500

At 09:07 2003-10-29 -0800, Mark D. Baushke wrote:
>It is not up to cvs to determine what data patterns should or should not
>be allowed to be committed into a file.

Indeed, I routinely commit conflicted files after applying vendor
updates.  Tag this state (with log messages distinguishing conflicted
files from other updated files), then tag again after I resolve
conflicts, then after successful compile and link, and so forth.  Just
comes from being anal-retentive, I guess.


reply via email to

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