Hi David; Am Samstag, 5. März 2011, um 11:06:01 schrieb davidMbrooke: > On Sat, 2011-03-05 at 09:06 +0000, davidMbrooke wrote: > > On Sat, 2011-03-05 at 01:46 +0100, KP Kirchdoerfer wrote: > > > > Hi kp, > > > > Thanks for the report. I thought I had tested that, but I did not try a > > complete re-build. I will fix now. > > > > dMb > > So the change was easy enough but I messed up the Git transactions > because I forgot to "pull" the other changes from the SourceForge > repository first.
Thx. > I *think* I have managed to revert my unintentional "Merge branch". > > Initially I tried: > $ git revert HEAD > but that failed: > fatal: Commit 36d32e327119dc57b18ad8cd2410fd659d0a7887 is a merge > but no -m option was given. > > So then I used: > $ git revert HEAD -m 1 > which seemed to work OK. > > If that isn't right then I probably need a Git expert to put things back > how they used to be - keeping the "Corrected path to isolinux.bin" > change but not the later one(s). It looks like you reverted all the commits from the last days; I've been always afraid, that I'd be the first who will run in this error - you won :) I believe a git expert can solve it quickly (and I'm interested how it can be solved) - otherwise it isn't a real problem, I still have all changes locally. kp ------------------------------------------------------------------------------ What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
