From: Junio C Hamano Date: Fri, 29 Dec 2006 18:25:38 GMT Subject: Re: What's cooking in git.git (topics) Message-ID: <7vhcveo8yl.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Johannes Schindelin writes: > 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? I think what you propose is in line is what I originally wanted to do, but I backburnered it exactly because I did not like the "if you want to risk a 3-way" phrase. It's not the wording, but the fact that I have to say "risk" bothers me. No matter how you cut it, it _is_ risky, and indicates to me that we are somehow doing this in a wrong way. I have a nagging suspicion that there may be a better approach, but I haven't found one. But you are welcome to take a crack at it.