[otherguy]

Not to hijack this thread... but I have an additional question that I think could aid in informing teams considering using git.

For teams that are using git, can you describe your workflow and what plugins you're using?

Our team has used eclipse with the egit plugin for the past two years. Honestly we aren't that thrilled with egit. Its only advantage IMO is that it's integrated with eclipse.

Our workflow is as follows, although honestly we haven't been terribly successful having everyone follow/understand it in the past. We maintain a master branch with known tested/working code, students branch master, add new functionality and push their new branches up to the repository. Mentors review the code, and make comments against the branches using github's "issues" system. Once any identified problems are resolved, and the code is tested, the students submit a merge request, and a mentor merges the code into the master branch.

I'm interested in knowing how other teams are using git/github, and what tools they are using, in hopes that we can improve how we collaboratively develop code.