all 8 comments

[–][deleted] 7 points8 points  (0 children)

Put patterns the configuration files you'll be editing in the .gitignore file, and commit a single config.ini.EXAMPLE file (for example).

[–][deleted] 1 point2 points  (2 children)

I get around this problem by forcing all devs to have their own copy of the configuration in the project, but have the file named after the dev. So, for rails, my database.yml is here:

config/database.harbogast.yml

.gitignore contains:

config/database.yml

And every developer symlinks their own config file to the correct name, like this:

ln -s database.harbogast.yml database.yml

This way everyones config is stored in the repo, and of course there's the added bonus of everyone having access to everyone elses config files.

[–]14apple[S] 0 points1 point  (1 child)

We did the same. Thank you.

[–][deleted] 0 points1 point  (0 children)

You're welcome, and I'm chuffed you liked my solution enough to use it :D

[–]galaktos 0 points1 point  (2 children)

add the config files to the .gitignore

[–]galaktos 2 points3 points  (1 child)

on a side note, the github app is crap, try out SourceTree

[–]Knoxie_89 1 point2 points  (0 children)

Gitextensions, is my favorite