[clug] Telling git to not update files across braches

[jm]

Say you have a git repository where the branches represent different
execution environments (eg, dev, staging, prod). Some files should be
carried across when commands such as,

git merge dev

are executed. Other files hold environment specific settings and should
not be carried over except possibly manually. Pulls from remote servers
should be merge within the branch though. I've tries using
.gitattributes with "merge=ours" but this doesn't seem to work. Does
anyone have any possible solutions?


Jeff.