Hacker News new | ask | show | jobs
by SAI_Peregrinus 2292 days ago
I work on an embedded device. Our tests include power analysis testing in LTE/GPS simulators of all the sleep/wake states. Total testing of a release takes about two weeks.

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.
1 comments
AstralStorm 2292 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.

link
SAI_Peregrinus 2288 days ago
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.
link