git workflow: Can I prevent a certain file from being merged to another branch but still keep it under version control?

I found an answer on another question on Stack Overflow, credit goes to fcurella: Let’s say you want to exclude the file config.php On branch A: Create a file named .gitattributes in the same dir, with this line: config.php merge=ours. This tells git what strategy to use when merging the file. In this case it … Read more