[Top][All Lists]

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

Re: AW: Delphi´s .DFM files, store as ASCIIor binary?

From: Stephan Petersen
Subject: Re: AW: Delphi´s .DFM files, store as ASCIIor binary?
Date: Wed, 13 Jun 2001 06:36:50 +0000

Hi Walter,

thanks for your reply!

> I don't know, if you can tell cvs, not to merge certain files (sure you
> don't want to mark them as binary <g>).
> But for me a merge always has some extra work: if I commit a 2nd change, I
> get an error and have to do an update first. This update will merge the
> changes and before I commit the resulting file, I check the foreign changes,
> look at the form, compile the program etc.

So, the gist of this is that when an update leaves you with
a merged form file, this never really caused any problem for,
do I understand this correctly?


Stephan Petersen                           address@hidden

>-=-=-=- Visit GTT's Technical Thermochemistry Web Page at =-=-=-=-<
>-=-=-=-       =-=-=-=-<

reply via email to

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