Hacker News new | ask | show | jobs
by AstralStorm 2303 days ago
The part that's most contentious about git-flow is release branches.

You still should merge often to develop, which when tested becomes master.

1 comments

The issue there is that you typically find some issues in testing, and need to fix them. That's why you test. You can either have a release branch and a develop branch, cherry-picking/merging fixes into the release branch as well as develop, or you can just hold off on merging any "not-for-this-release" branches for a few weeks. Just let the PR sit there. Alone. In the dark.