I’ve been toying with my Git workflow the past year at Continuum and have come up with a good workflow for handling semantically versioned software inside Git. This post is my attempt to catalog what I’m doing. Here’s the TL;DR version: master is always releases that are tagged Code gets merged back in to develop before master, all work happens in feature branches off of develop Bug fixes are handled in branches created from tags and merged directly back in to master, then master is merged to develop.

My latest book on Git, Pragmatic Guide to Git goes on sale today! I’m really excited about this new book. It’s the culmination of a year’s worth of work on an entirely new format for Pragmatic Bookshelf. From today’s announcement: Last summer, Pragmatic author Travis Swicegood proposed a new kind of book covering the popular version control system, Git. We thought it was a good idea–so much so that we’ve launched a whole new series in this format.