From: Sverre Rabbelier Date: Fri, 25 Jul 2008 11:50:40 GMT Subject: Re: [RFC] custom strategies in builtin-merge Message-ID: In-Reply-To: <20080725113316.GF32057@genesis.frugalware.org> On Fri, Jul 25, 2008 at 13:33, Miklos Vajna wrote: > 1) Maintain a list of commands that has a git-merge- prefix, but not a > strategy. This list would currently contain "base, file, index, > one-file and tree". Sounds a bit error prone, and could lead to unexpected results if/when someone creates a new command ('git merge status' anyone?) which is then suddenly treated as a merge strategy. > 2) Require custom strategies to have a different naming scheme, like > if "foo" is a custom strategy, then it would have to be named > git-merge-custom-foo, _not_ git-merge-foo. I think this is cleaner, what would be even nicer is to change the current names too, so name them all "git-merge-stragegy-foo". -- Cheers, Sverre Rabbelier