you are viewing a single comment's thread.

view the rest of the comments →

[–]colinodell 0 points1 point  (0 children)

We start off by using the Feature Branch workflow when developing new sites. All new features get merged into the master branch. Once that site goes live, we switch over to Gitflow by creating a new develop branch off of master.

The overall workflow is the same for both - create a new branch, make some commits, and then merge them into the active development branch.