From: Miklos Vajna Date: Sat, 09 Aug 2008 23:42:32 GMT Subject: Re: keeping /etc under git with etckeeper Message-ID: <20080809234232.GB18960@genesis.frugalware.org> In-Reply-To: <14b409fc0808091148k69f4019n6996261a710adfca@mail.gmail.com> On Sat, Aug 09, 2008 at 08:48:39PM +0200, Pierre-Julien Bringer wrote: > 3 If Git has some sort of merge conflict on important config files > (passwd, etc...), it would be pretty bad [3]. > > When using etckeeper: > 1 There would be a link between the changes if a commit occurs between tasks. I don't exactly see what the problem is here. > 2 Permissions are stored thanks to Metastore. Actually it no longer uses metastore, but yes, etckeeper handles permissions properly, so it is not a problem. The second problem is point 3) from your previous list, but that's easy to avoid: never ever merge, rebase (or any other task that can result in a conflict) in your /etc. In short, if you want to just track your directory, then it's OK, but if you want to use git to handle the config of multiple machines, it'll be too problematic, I would not suggest doing so.