From: Leo Razoumov <slonik.az@gmail.com>
Date: Tue, 02 Dec 2008 02:49:08 GMT
Subject: Re: more merge strategies : feature request
Message-ID: <ee2a733e0812011849l1b319c96u9abbb4e8dd4f53ce@mail.gmail.com>
In-Reply-To: <4933AC03.6050300@op5.se>

On 12/1/08, Andreas Ericsson <ae@op5.se> wrote:
> 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)
> >

I guess that "no-overwrite" can be achieved by

git merge -s ours --no-commit

--Leo--