From: Andreas Ericsson <ae@op5.se>
Date: Mon, 01 Dec 2008 09:18:59 GMT
Subject: Re: more merge strategies : feature request
Message-ID: <4933AC03.6050300@op5.se>
In-Reply-To: <81bfc67a0811290848m6cb219c0y71a7266001096f2d@mail.gmail.com>

Caleb Cushing wrote:
> conflict: this strategy would always resolve in a merge conflict
> allowing you to use git mergetool to piece the files back together.
> 
> no-overwrite: if a change from the branch being merged in would
> overwrite something in the current branch don't merge it. (I think it
> needs a better name)
> 

If you could come up with use-cases where each would be useful, I
think you'd have a much easier time to gain acceptance for your
suggestions. Right now, you're saying "I want a red button" but
you're not explaining what it's for.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231