We\'ve seen and watched the videos on how large distributed teams are using Git, but what about those of us who aren\'t distributed and who work in the office with the rest
Take a look at a workflow github team uses:
http://scottchacon.com/2011/08/31/github-flow.html
It requires using github, but also is pretty straightforward and clean.