Re: git merge and generated files?

From: Date: Wed, 28 Mar 2012 09:51:59 +0000
Subject: Re: git merge and generated files?
References: 1 2 3  Groups: php.internals 
Request: Send a blank email to internals+get-59195@lists.php.net to get a copy of this message
Hi, On Wed, Mar 28, 2012 at 11:48 AM, Niel Archer <spam-free@blueyonder.co.uk> wrote: > git config --global core.autocrlf true > > Global option obviously makes this apply to all repoes, not sure how it > applies without it, as this is pretty much the only way to be able to > work interoperably with Visual Studio. Thanks for the headup about the new line thing, my mistake. Gustavo fixed it too. However it is not the topic of this thread :) Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org

« previous php.internals (#59195) next »