How to manage configuration files when collaborating?

Question

I\'m writing a short script with a few simple variables at the top of the page. I want to work on them with a friend, but we aren\'t sure how to manage the variables needing

Answer 1

Other options (not elegant but may be helpful):

• Use git stash and git stash pop for your config file
• Have a branch named, say, config which has your local config file changes and then use git checkout config

Second option is good if you need to keep the local config changes in the repo (somewhere).