git - how to exclude files from merging

Question

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

Answer 1

In each of your branches, add file .gitattributes in root.

For each branch, specified the files to be ignored at merging like this:

filename merge=ours

and dont forget to activate the driver for that:

git config --global merge.ours.driver true

Try the merging, you'll see that files specified in .gitattributes in each branches will be untouched while merging happen.