Is it possible to have only certain files show up in one git branch and not in the other? So I have two branches "master" and "dev" which have "server" files, one to a production and the other to a dev server. In both of my branches, I have those two files. Sometimes those files could change (not usually though), which led me to believe that there are files that should exist in one branch and not in the other, so when I merge my dev branch into my master branch, I would like it to merge every file that was touched except for that one dev server file (if it was indeed changed). Like I said this file can change, so I don't want to reference it in .gitignore. I've searched all over the internet, but I really can't find anything close to what I'm looking for without changing the git branch workflow. Can this be done?
Current situation: dev branch + master branch = dev_server.dcf & prod_serve.dcf (both branches track both files)
What I want: dev branch = dev_server.dcf ......&..... master branch = prod_server.dcf (when merging dev branch into master branch, I don't want dev_server.dcf to move into master branch; and vice versa, when I merge master branch into dev branch, I don't want prod_server.dcf to move into dev branch)
