From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Dec 2006 17:55:56 GMT
Subject: Re: What's cooking in git.git (topics)
Message-ID: <Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vtzzfp86x.fsf@assigned-by-dhcp.cox.net>

Hi,

On Thu, 28 Dec 2006, Junio C Hamano wrote:

> * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit
>  + git-merge: preserve and merge local changes when doing fast
>    forward

I'd like this, but behind a command line switch. And in addition to saying 
"cannot merge, blabla needs update", git could spit out "if you want to 
risk a 3way merge, go ahead and add the --preserve-local flag to 
git-merge".

Comments?

Ciao,
Dscho