+ [2015-07-30T10:25:32Z] nash_ Hi. i want some files to be branch specific. for example i have two branch 1.develop and 2.production. i have separate config files like email address and db configurations for develop and production respectively. now when i try to merge develop into production,the settings get overridden by develop branch into production.how to avoid that?