I have a situation where I have a different web.config configuration for each branch and I need to merge constantly from branch A to Branch B, however every time I do so, I get the file to be overwritten. I was thinking of having variations of this file for each branch, something like:
dev-Web.config prod-Web.config
Is this possible? Which approach would you take?