Matthew Brett wrote: > Hi, > > I enjoyed this quote from http://www.eecs.harvard.edu/~cduan/technical/git/ > > Summary: You can only really use Git if you understand how Git works.
Matthew, Nice link, thank you. Another couple of quotes from that tutorial: Important note: if there are any uncommitted changes when you run git checkout, Git will behave very strangely. The strangeness is predictable and sometimes useful, but it is best to avoid it. All you need to do, of course, is commit all the new changes before checking out the new head. Important note: Git can get very confused if there are uncommitted changes in the files when you ask it to perform a merge. So make sure to commit whatever changes you have made so far before you merge. Sounds like booby traps for occasional users, or for people who are multitasking a little too much. The hg UI approach is different: it blocks that sort of thing with a warning, and provides override options when needed. And for comic relief, here is a line from a git man page: The state you are in while your HEAD is detached is not recorded by any branch... It hurts to even think about such a state... Eric _______________________________________________ Numpy-discussion mailing list Numpy-discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion