Great reference on some of the more complicated Git workflows
potatohead
Posts: 10,261
http://justinhileman.info/article/changing-history/
Just dropping this here for those continuing to improve on their understanding of Git.
Just dropping this here for those continuing to improve on their understanding of Git.
Comments
That graph is actually quite an achievement compared to the old school revision control systems. Most trains get derailed without systems like mercurial and git.
I've not used Git or Mercurial in a more complex scenario. Right now, I'm working with an application (NDA) that uses Git as an integrated data management system. For a number of reasons, I'm needing to understand higher order use cases, and so there you go.
BTW, that article has a lot linked, for those reading at home: http://nvie.com/posts/a-successful-git-branching-model/ Just one of a few gems in there.
This thing is powerful! I think back to some of the stuff seen here and we could have used Git much earlier, and today sorting things out would be easier, and we may well have built more things, or attracted contributors easier.
Frankly, if I were Parallax, I would integrate the forum with GitHub. Sign up, get a repository and some good stuff already populated, with the tool downloads already tuned, primed, ready to go. Or, specify your existing repository, and it just sets the Parallax stuff up for you proper. Doesn't matter.
Bonk on a button, or issue a command, and it's all fetched online, managed nicely and it works with the forum in a way much more close, like zip packages sort of do today. Instead of uploading an attachment, we could use a button or two that does the work for any Git user. They click on it, and the necessary operations are performed so that anyone else can both get it local to toy with like they do now, and they are setup to participate in the community in a managed way all at the same time.
I'm going to start managing a fair amount of things with GitHub. Doesn't have to be code, and I've put it off for too long. For 20 years or so, I've been doing a lot of work with PLM / PDM systems related to mechanical engineering and product design. These operate in ways very similar to Git and friends, but not quite the same. Of course, that's due to the mess found in CAD files, references, libraries, assemblies, etc... IMHO, Git and friends are powerful enough now to take this role. I said this of Mercurial too. And I'll leave that commentary right there for now, for what should be obvious reasons.
Not sure I have time... but, I sort of want to either see or do, and for sure participate in a learning type series. We need it. Man, we could do one with just text files and some pictures and teach people a lot. In CAD land, I use Legos and Tinkertoy models. Once people make the connection, it's amazing what they go off and build and how complicated it can get from a structure point of view. I think this Git learning could work the same way, but I'm still ramping up on the detail myself.
The key to that is to map real world understanding and "instinct" to the structure with something really lean, simple, fun. Again, with CAD, "builder" type toys rock. People get it, and when they get into trouble, they can see the trouble, because the representations they are using are basic, innate, easily processed, leaving them to "play" in a lean way. This is very, highly likely to be effective with Git and friends too. Just some thoughts in case somebody jumps on it. I won't care. Just sharing at the moment.