I think I saw that one by Linus on Youtube but didn't have time to watch it. I'm going to have this class use Git to submit all their work (project and otherwise). I've used it a lot for my own work, but never on a team project, so I will need something of a primer on how to do branching, merging, and so forth.

I understand there's a typical workflow in which you have 'master' for the releases, 'dev' for the latest working version, and feature branches are branched off 'dev'. If there's a good video on how to do that, it'd be ideal.

I don't know of a video. But you should check out this project and its readme:

https://github.com/nvie/gitflow

edit: oh, the readme links to screen-casts! Also, I've worked on teams that require gitflow so I assume it's useful experience for students to have.

That link led me to another, which led to this original article on the git-flow model: http://nvie.com/posts/a-successful-git-branching-model/

Thanks! That's just what I was looking for.