如何在git分支中“隔离”文件

Question

Is it possible to isolate a file in a git branch from the parent?

I have an msbuild configuration file for each of my branches, and when a merge is done from the parent, I don't want to file to change. Also, when I push the branch to the parent the file shouldn't be pushed.

In perforce there is a concept called "isolate" that offers this functionality, is there something similar for git?

gitattributes looked promising with merge=ours, but it looks like that has to be set up on each machine.

thanks!

Answer 1

I would add a pre commit hook to your repo to look for that specific file and fail if it tries to be included in a commit.

Your file would still be committed (the first time), and attempts at updating that file can only be done by explicitly bypassing the pre-commit hook (so you know it wasn't done accidentally)