We’ve mentioned it before, but at WebDevStudios, we use git flow–a specific git workflow first proposed five years ago, though the original author, Vincent Driessen, says he had been using it for a year before posting about it. Git Flow works best when you are developing a product that has definitive releases, but this gets really gray when you have a handoff process where you build a complete site and then give it to a client. We’re working on developing a Git Flow process that adapts Git Flow for use in client work. First, let’s review how Git Flow works. Main Git Flow Branches It all starts with two main branches: master (which is the stable version of the software) and develop (which is where all the development happens). The main idea here is that develop is constantly changing as new things are added, and when features are completed, they are merged into master. In this scenario, develop is always going to reflect what’s going into the next production release. Supporting Branches There are also three different sets of supporting branches. feature branches are for new features being developed for future versions of the software. When creating feature branches, a hierarchy is added
Share This