News for hackers. Stuff that matters.
Re:Our Development Workflow by rorykoehein on Friday November 07, 2014 @03:47AM (#8571686)
Couldn't you merge the features that are done to your staging branch and from there merge to production? Your staging branch would be the 'release branch' in this model: http://nvie.com/posts/a-successful-git-branching-model/
Re:Our Development Workflow by michaelgrafl on Friday November 07, 2014 @07:32AM (#8572210)
Thanks for the link.

We merge feature into dev when we want to show a feature to a fellow developer.

We merge feature into staging when a feature is ready to be tested by non-developers and to be included in documentation.

We merge feature into production when it's ready for all users.

Has been working out well so far.

Re:Our Development Workflow by securingsincity on Friday November 07, 2014 @08:38AM (#8572414)
We have a similar process it allows for more releases. imo there are things that require more testing then others, and they shouldn't hold up the process of releasing code.
Re:Our Development Workflow by IanCal on Friday November 07, 2014 @08:37AM (#8572409)
> We merge feature into dev when we want to show a feature to a fellow developer.

Wouldn't you just show them the feature branch?