From: Petr Baudis Date: Wed, 09 Nov 2005 23:12:48 GMT Subject: Re: Expected Behavior? Message-ID: <20051109231248.GL16061@pasky.or.cz> In-Reply-To: <46a038f90511091504l7218df18k251bec75491891e9@mail.gmail.com> Dear diary, on Thu, Nov 10, 2005 at 12:04:11AM CET, I got a letter where Martin Langhoff said that... > On 11/10/05, Petr Baudis wrote: > > The world would be so much better if there would be just a _single_ > > per-file automerger instead of three right now... > > I don't quite agree with this. The multi-merger mechanism is something > (relatively) unique and powerful in GIT. I'm not talking about mechanism but about the recommended policy (if you have something better, fine, use it - just keep _one_ default one instead of three, since this doesn't have anything or much to do with the actual merge strategy). Besides, > Having fast+stupid, with fallback to slow+smart is an excellent > strategy, and having the mechanism in place means that if someone is > crazy enough to write a smarter merge script for a language or a > particular project (say, to ease the transition to a new directory > layout) it is entirely possible. what mechanism are you talking about? All the scripts have it hardcoded what to use, it seems - cg-Xmergefile, git-merge-one-file or some subroutine... -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.