> As I said elsewhere, it would be super cool to have such a thing for /etc, if you wack a config, debian wacks it, you upgrade, you then get all the features that an SCM system give you for merging. I dunno what Git gives you but BitKeeper does a kickass job of automerging and has a complicated but pleasant graphical file merge.

Etckeeper [1] does this. There's also etcd, but that seems to be more akin to Puppet and Chef. Disclaimer: I've never used any of the mentioned software.

[1] https://etckeeper.branchable.com/