> I think the preference is to bring changes to config.* in from the > masters. That way we minimise the possibility of changes local > being overwritten by a future sync-up with the masters. Yup. My script doesn't *do* a merge, it just complains when the two toplevels differ.