On Tuesday 04 March 2008 09:23, [EMAIL PROTECTED] wrote: > Well, I will stay with autocrlf=false because use of unix is not > planed in my company. If it were to change, I would do what you said > above (applying the CRLF commit to all branches). It solved the error > message when coming branch to development after checking out the > master.
I'm in a cross-platform project, and I have autocrlf=false (the default), and it works, i.e. those files (C++ source code) that are edited and compiled on both Linux and Windows have CRLF. But perhaps I've just been lucky. If I were to make a change, then I would absolutely *not* commit one big CRLF->LF change, but I would rewrite history and convert CRLF in *all* files of the entire history and continue from there. -- Hannes
