If anyone is still having trouble with git, I suggest watching this tutorial:
http://excess.org/article/2008/07/ogre-git-tutorial/ You only need to watch the first 40 minutes or so, where it explains all the basic concepts of git, and its "theoretical model" of commits and how they link up to form a history, etc. This is essential in understanding the difference between a rebase and a merge, what a fast-forward is, etc etc... After I watched it, everything made a LOT more sense to me, and I understood enough to know "what to do" when a problem with merging occurs, which also makes reading the manual page easier because then you know exactly what you're looking for, and just need to find the command option that does what you want. X _______________________________________________ Devl mailing list [email protected] http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
