Hi Yves on 11.02.2014 19:41, Yves Blusseau wrote: > ...
> > Hi Erich, > you can stash your changes. After that fetch the branch master from the repo > and rebase your work on it: > > git stash > git pull > git stash pop Did that, now tons of conflicts arose, at least it did not abort. git status shows now # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: Changes # modified: buildimage.pl # modified: buildlwp.sh # modified: buildtool/Clean.pm # modified: buildtool/Clean/Buildclean.pm # modified: buildtool/Clean/Distclean.pm # modified: buildtool/Clean/Remove.pm # modified: buildtool/Clean/Srcclean.pm # modified: buildtool/Config.pm # modified: buildtool/DownloadTypes/File.pm # modified: buildtool/DownloadTypes/FileSymlink.pm # deleted: buildtool/DownloadTypes/Https.pm # modified: buildtool/DownloadTypes/Wget.pm # modified: buildtool/Make/Build.pm # modified: buildtool/Make/Source.pm # deleted: buildtool/Tools.pm # modified: buildtool/buildtool.pm # modified: cleanall.sh # modified: conf/.gitignore # deleted: conf/buildtool.local.sample # deleted: conf/image/common/configdb.serial # deleted: conf/image/common/configdb.vga # deleted: conf/image/common/leaf.jpg # deleted: conf/image/common/memtest86+-2.11.bin # deleted: conf/image/common/memtest86+-4.20.bin # deleted: conf/image/common/readme # deleted: conf/image/isolinux/isolinux.dpy # deleted: conf/image/pxelinux/pxelinux.dpy # deleted: conf/image/syslinux/syslinux.dpy # deleted: conf/image/templates/config-isolinux.cfg # deleted: conf/image/templates/config-syslinux.cfg # deleted: conf/image/templates/files-isolinux.cfg # deleted: conf/image/templates/files-pxelinux.cfg # deleted: conf/image/templates/files-syslinux.cfg # deleted: conf/servers.cfg ..... and so on for another 800 lines. Should I just git reset to get in line? What will I loose if I do that? Thanks Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ 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
