Le 12 févr. 2014 à 11:33, Erich Titl <erich.t...@think.ch> a écrit :
> Hi Yves > > on 12.02.2014 09:41, Yves Blusseau wrote: >> >> Le 11 févr. 2014 à 21:24, Erich Titl <erich.t...@think.ch> a écrit : > ...> >> Don ’t know how you have so much conflict. > > I _believe_ I know the reason. > > For some unfathomable reason the root directory of the whole tree has > changed from > > bering-uclibc to bering-uclibc-master The name of the working directory is not important. The better is that you sync your local repository to the remote one with commands like: git fetch —all git co master git reset —hard origin/master Be careful the last command will erase all your local modifications that was not committed. After that look in your stash for the changes and try to apply them on the master branch. Also don’t forget to drop all stash that are too old. Yves ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
