[development] Patching settings.php

[Moshe Weitzman]

> If anyone has any tips for excluding settings.php from a patch, that
> would be greatly appreciated. 

i made the same mistake once ... now i always copy sites/default to 
sites/127.0.0.1 and edit settings.php there. substitute 127.0.0.1 for your 
domain name if you are not developing locally.

this insures that i never get conflicts, and never include my settings in a 
patch.