title: git - how to exclude files from merging
body: <p>I'm trying to keep 2 projects of website in one repository. This websites are mainly the same except template (html,css) files and few config files.
  The main site (which is my say Supersite) is in branch master. The second site is in branch secondarySite. Every time, when I develop some new feature in master branch I want to merge it to secondarySite but I want to exclude templates files from merging.</p>
  
  <p>I found partial solution here <a href="https://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-sp">How do I tell git to always select my local version for conflicted merges on a specific file?</a> but it works only when I change template file in both branches and <strong>conflict occurs</strong>. When there is no conflict git just use newer remote version of file.</p>
  
  <p>How can I tell git to <strong>always</strong> leave specified local files unchanged even if there is no conflict.</p>
  
  <p>Or maybe I use totally wrong approach to the problem?</p>
  
  <p>Thanks in advance for any help.</p>