Git rebase and semi-tracked per-developer config files

Question

This is my first SO question and I\'m new-ish to Git as well.

Background: I am supposed to be the version control guru for Git in my group of about 8 developers. As I d

Answer 1

The general idea behind config file is to only put under source control:

• a template of it,
• a script able to generate a proper config file based on local data (username, hostname, ip address, and so on)

The other solution would be to do this in a dev branch, along with other local devs, and add a custom merge driver to merve merge back those config file modifications.
But that more complex and generally not needed if your template file is correctly built.

Answer 2

Maybe you can force a conflict and add a rere configuration you don't change data. But I think it's better to have no commit with change in this change.