The Git version control system can sometimes be a little intimidating for new users -- until you learn just a little bit about what is under the hood, then the full power of this modern version control system is fully revealed. In this full-day workshop, we'll start off by using Tinkertoys to demonstrate the basic commands of Git (including merge and rebase). From there we’ll move on to dealing with remote repositories, dealing with conflicts, and working with patches. This workshop will be valuable for anyone just learning Git, or experienced users who aren't aware of what is actually going on "under the hood" during everyday usage.
All students should have a working local copy of the git version control system on their computer (Windows: http://help.github.com/win-set-up-git/, Mac OS X: http://git-scm.com/). It is recommended (but not required) that students be familiar with the concepts of version control systems.