|
From: Ferdinando A. <fer...@am...> - 2002-04-30 16:01:01
|
At 06:58 PM 4/29/2002 +0200, Andre Louw wrote: >I'm running into trouble when checking in or out from >QuantLib's CVS. >Any file that I worked on that somebody else worked on as well I get >conflicts, 99% of the time because of >indentation. It's been probably my fault. Next time I will be more careful. >I haven't really checked but I'm pretty sure there must be some automated >way of getting this to work. >IOW get a common .indent.pro on the CVS server, which all files are >converted to when checked in, >and a personal .indent.pro which is used when checking out. To use 2 different .indent.pro on the CVS side and the developer side wouldn't mark all files as modified? This said if we settle on one .indent.pro and automate the CVS I would go for it ciao -- Nando |