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

[Stephan Petersen]

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

--
Stephan Petersen                           address@hidden

>-=-=-=- Visit GTT's Technical Thermochemistry Web Page at =-=-=-=-<
>-=-=-=-      http://gttserv.lth.rwth-aachen.de/gtt/       =-=-=-=-<