Why not just keep environment dependent settings in a separate file that is not tracked? Then you have no problem with files that are 'half-tracked'.