title: How to prevent tracked config files from being changed by merges in git?
body: <p>I have a web project with two git branches (developing and production) and each one connects to a different server (dev and prod). Each branch has a set of tracked config files, such as different URLs, database options, sql exported files, etc. which are different on both branches.</p>
  
  <p>Every time I try to merge those branches I get a lot of conflicts in these settings files which need to be resolved manually, but every now and then I miss something. In short, it is a nightmare. My question is therefore, how can I avoid this?</p>
  
  <ul>
  <li>Is there a way to prevent any changes to those config files while merging or rebasing?*</li>
  </ul>
  
  <p><strong>Suggested Solution:</strong>
  <em>"Try to make those files untracked".</em> I tried this but whenever I pulled from the production file I get those files deleted and replaced, so I don't know if I should do it in a different way. </p>