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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html