[DUG] Delphi & Git

[Conor Boyd]

WRT keeping DFMs as text to facilitate diffing, list members might not be aware of Beyond Compare <http://www.scootersoftware.com/> ’s ability to diff binary DFMs.  Once you configure something like TortoiseSVN to use BC as your diff tool, it significantly reduces the issue of binary vs text DFMs, among all the other niceties in BC3 such as 3-way merging, etc.

 

I’m not particularly advocating keeping DFMs as binary, just throwing this out there for those who may not be aware of it.

 

While I haven’t used Git, I concur with Jolyon’s initial comment that I don’t think there’s anything specific to keep in mind about using Delphi with any one particular VCS system.

 

From: delphi-bounces at listserver.123.net.nz [mailto:delphi-bounces at listserver.123.net.nz] On Behalf Of Jolyon Smith
Sent: Thursday, 29 May 2014 10:20 a.m.
To: NZ Borland Developers Group - Delphi List
Subject: Re: [DUG] Delphi & Git

 

There is nothing particularly noteworthy about using Delphi with Git that isn't also applicable when using Delphi with any other version control system, such as keeping keeping DFM files in text form rather than binary, to facilitate diffíng etc etc.  Other than that it is simply a question of the differences in how you use Git as opposed to those other systems (e.g. in establishing files or filetypes to be ignored for the purposes of versioning etc).



 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://listserver.123.net.nz/pipermail/delphi/attachments/20140529/f8c7d521/attachment.html