Re:GitFlow considered harmful
by jrochkind1 on Friday June 19, 2015 @10:59AM
(#9745209)
And then do you need the 'develop' branch at all? If not, you're describing something similar to what OP is.
Re:GitFlow considered harmful
by solutionyogi on Friday June 19, 2015 @11:56AM
(#9745601)
Yes, 'develop' branch is still useful. See my comment on that here: https://news.ycombinator.com/item?id=9744787
Let's say next release is Release-1.10
1. We merge Feature A and Feature B to it.
2. Feature A is tested and ready to be deployed. Feature B is not.
3. You either revert Feature B commit OR re-create the release branch with only Feature A.
4. Deploy the release branch.
5. Merge the release branch in to master.
This is exactly what we do at my current workplace where we have 4 developers working on changes with different release schedule.