git usage conventions
We've been using git at work for a greenfield project and, so far, this has worked for us. It could be a useful template to get another team started. We have gotten rid of the name 'master', which is only a convention anyway, and instead are using a few permanent branches: <ul> <li>production (only stable code which gets deployed to production goes there. The only branch to be merged in, EVER, is 'stable')</li> <li>stable (only stable code which goes to the staging environment goes there.