franciscojunior/Npgsql2 — pull request #55 by roji (2013-09-23 22:14:28+00:00)
Title: Lots of normalization

A big batch of normalizations. I finally went ahead and did much more than just line endings - might as well take advantage of the moment.

If this gets merged and you have any outstanding branch or pull request, any rebase will generate tons of fake conflicts. Here's a guide on how to safely rebase on the normalized master:
* Rebase your branch up until the last commit *before* the normalization batch. All conflicts are normal, real conflicts which you need to resolve.
* Rebase your branch on the last of the normalization commits, but not beyond. Any conflicts (and there probably will be a lot) are fake. Resolve by simply take your own version, *and then normalizing it yourself* (no tabs, only 4 spaces, no CRLF, etc.).
* Rebase your branch on the rest of the commits, all conflicts are normal.