On Fri, Nov 17, 2006 at 10:35:04PM CET, Junio C Hamano wrote: > Unfortunately the only way to know if there will be a file-level > conflict is to try one, and stashing away the current state just > in case it conflicted is a performance penalty, so this probably > should stay as an option just like "-m" to the "checkout". I think it would be just great if it worked at least for fast-forwarding case; I think this is where it is actually most useful. Cogito tries to support even the three-way case as long as the changes touch different files, but I'm not sure if it was a good idea to begin with. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ #!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj $/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1 lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/) - 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