undefined | Better HN

0 pointssolutionyogi10y ago0 comments

If you need independent release cycle for Feature A / Feature B, you adjust GitFlow by basing all branches (feature/release/hotfix) from the master.

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.

0 comments

And then do you need the 'develop' branch at all? If not, you're describing something similar to what OP is.

Yes, 'develop' branch is still useful. See my comment on that here: https://news.ycombinator.com/item?id=9744787

j / k navigate · click thread line to collapse