Hi Erich;
Am Mittwoch, 15. Oktober 2014, 19:45:28 schrieb Erich Titl: > Hi KP > > on 15.10.2014 15:58, kp kirchdoerfer wrote: > > HI Erich; > > ... > > >> I believe uboot should be removed from the build environment unless it > >> is not disturbing. > > > > I'd like to let it as is as reminder :) > > Yes, but it makes it impossible to merge the new branch :-( I'm pretty shure you can merge, without forcing others to follow your pathes - otherwise git would be a desaster. Pls show us where your merge fails and I'm shure we can help. See also "merging maint into master " from 15.01.2013 on leaf-devel to get an idea... kp ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
