Shshshano's comment is technically correct - we treat our dev branch as master - or at least how I've always treated master. It's the most up-to-date and production-ready branch.

Our git strategy can be summed up with:

- Commit everything to one, main branch

- Cut production releases on a separate branch or with tags