Different Config Files in GitHub Repo Branch

Question

So I have a GitHub repo with a master branch and a staging branch, they both have separate config files for deploying to different places. I was hoping that when I perform a pu

Answer 1

You can do this using the ours strategy. Create a file named .gitattributes in your both branches and add the following content in it:

path/to/your/config.json merge=ours

Then commit your the .gitattributes files:

git add .
git commit -m 'Added gitattributes'