I have a number of different versions of a php application, configuration file. Currently the conf folder is being ignored by git, but I'd like to track the changes to config.ini separately, and also label where each version of the config.ini should be. We are not using any specific deployment tools, and though ive looked at capistrano, we are not ready to use it. Also, I looked into using gist or a subrepo. But unsure how to track the deployments. Each config file is ignored, so i'd like to track versions and deployment history. So, when deploying to production I can track changes, and prevent conflicts that introduce bugs.
This is a rough outline of what I mean.
Master Branch -> Production Config
Development Branch -> Development Config
Developer Jacks Local Dev, Branch A -> Config A
Developer Jacks Local Dev, Branch B -> Config B
Developer Jill Local Dev, Branch A -> Config A
Developer Jill Local Dev, Branch B -> Config B
So if Jack merges Branch A to master branch, and deploys code to production, the config file changes are deployed safely.
UPDATE: Been playing with git submodules a little today, and having difficulties push code back up to a remote repo. I'll stick with it, but its not looking good so far.