GitHub Tutorial - BlockadiaTeam/Blockadia-Team-Project GitHub Wiki

This article gives a good explanation of the conventional work flow using GitHub: http://scottchacon.com/2011/08/31/github-flow.html

GitHub workflow example: http://nvie.com/posts/a-successful-git-branching-model/

Solving merge conflicts in Eclipse git (EGit): http://eclipsesource.com/blogs/2011/05/30/merging-branches-in-eclipse-git-egit/