[Cosmo-dev] Fwd: [commits-cosmo] (mde) [4291] Removing vast amounts of redundant whitespace.

[Matthew Eernisse]

Apologies, guys.

I don't know if it helps, but version 1.4 of the SVN client allows you 
to ignore whitespace in a diff/merge, so you can get your changes in 
without a conflict (on Linux, 'svn merge -x -w'). Then you can use rsync 
locally with --exclude '*svn*' or do a fresh pull to get back on track.

Again, sorry for throwing that monkey wrench into y'all's work.


Matthew


Bobby Rullo wrote:
> Mde, 
> 
> Please don't do that again! It caused tons of conflicts for me and Travis.
>