05.03.2011 12:06, 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. > If you committed something into git, and somebody already pushed something into remote repo (so your commit is based on non-head commit) - after 'git pull' branches will be merged automatically if it is possible (no conflicting file changes), or it'll ask for manual merge if different commits affects same file. This is common situation. > 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). > > dMb You reverted merging and selected your tree as main, so now 'head' commit contains outdated source tree. To fix this - it's enough to revert you last 'revert' commit.
------------------------------------------------------------------------------ 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
