In a small web agency, mainly creating sites for clients, we find a mix of "git-flow"-style and continious deployment works best.
In the weeks before a new site is launched, we work to our own feature branches and merge into master when a feature is complete. In the run up to the site launch, when there's just CSS tweaks and the odd bug fix, people start working on directly master and deploying straight to staging servers.
When a site has been launched we normally keep working just on master, though occasionally creating feature branches for bigger changes.
This seems to work well for us as our DVCS needs change over time. I'd be interested to hear how other web agencies manage the different stages of developing clients' websites.
In the weeks before a new site is launched, we work to our own feature branches and merge into master when a feature is complete. In the run up to the site launch, when there's just CSS tweaks and the odd bug fix, people start working on directly master and deploying straight to staging servers.
When a site has been launched we normally keep working just on master, though occasionally creating feature branches for bigger changes.
This seems to work well for us as our DVCS needs change over time. I'd be interested to hear how other web agencies manage the different stages of developing clients' websites.