Le 11 févr. 2014 à 21:24, Erich Titl <erich.t...@think.ch> a écrit : >> >> 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 > ..... > and so on for another 800 lines.
Don ’t know how you have so much conflict. Check if you have the stash save (if conflicts the stash must not be drop). Check with git stash list to see if your stash was save. If saved you can do a git reset —hard because the HEAD was’nt moved. Now you must find what files you need to change to apply your patch …. Regards, 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
