Re:Please stop recommending Gitflow
by AstralStorm on Thursday March 05, 2020 @01:08PM
(#22496226)
The part that's most contentious about git-flow is release branches.
You still should merge often to develop, which when tested becomes master.
Re:Please stop recommending Gitflow
by SAI_Peregrinus on Monday March 09, 2020 @03:01PM
(#22528546)
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.
Trying to keep master consistent without git-flow means we get PRs sitting around for a month and merge-conflict hell days when we merge everything to make a build to send to QA.
Git-flow is bad if you have CD. Git-flow is great if you can't do that.