4 ms·
Yes, a good middle ground is the slightly confusingly named “GitHub flow”: https://docs.github.com/en/get-started/quickstart/github-flow https://docs.github.com
by DougBTX 5y ago
Yes, a good middle ground is the slightly confusingly named “GitHub flow”: https://docs.github.com/en/get-started/quickstart/github-flow https://docs.github.com/en/get-started/quickstart/github-flo...
The main branch is always stable, releasable. Feature branches are branches off main, which are then merged back into main. No develop or release branches.
It is like trunk based development, especially if branches are kept short and regularly rebased onto origin/main, but with a point to run PR checks before merging.
- pydry 5y agoThis is how most people I know develop and have done for years but I've never heard anybody ever call it "github flow".
- Traubenfuchs 5y agoI also lifted an eyebrow at this. It‘s just „trunk based development with feature branches and prs“.
- dpark 5y agoI think it acquired this name to distinguish from “git flow”, an alternative way to use git that is, put politely, somewhat of a maintenance headache. https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow https://www.atlassian.com/git/tutorials/comparing-workflows/...
- pydry 5y agoI agree gitflow is annoying but this name sounds more like a cringey excuse to attach a Microsoft trademark to a common practice to me.
- dpark 5y agoThe term “GitHub flow” existed prior to the Microsoft acquisition. The GitHub documentation history would be definitive, but you can find articles dating back to 2014 discussing GitHub Flow vs GitFlow. The acquisition was in 2018. I agree that the name isn’t the best. It is however at least specific. “Trunk based development” encompasses a class of development processes. Although I don’t think I’ve ever actually described a real world process as “GitHub Flow” because almost no one knows what it specifically is anyway. Disclosure: I work for Microsoft.
- CRConrad 5y agoStill just a cringey excuse to attach a trademark to a common practice, only sans the "Microsoft". (OK, "git flow" was in a way even worse; that was Atlassian trying to usurp the generic "git" name for their own particular flow.)
- dpark 5y ago> Still just a cringey excuse to attach a trademark to a common practice, only sans the "Microsoft". I don't understand any of this sentence. Of course it's "sans Microsoft". It predated the acquisition by years. But also I don't see the "cringe" here. "GitHub flow" was introduced as "this is what we do at GitHub". It is (or at least was?) the GitHib flow. https://githubflow.github.io/ https://githubflow.github.io/ > OK, "git flow" was in a way even worse; that was Atlassian trying to usurp the generic "git" name for their own particular flow. Atlassian didn't even create GitFlow. https://nvie.com/posts/a-successful-git-branching-model/ https://nvie.com/posts/a-successful-git-branching-model/ I don't understand this mindset that starts with assuming everyone is essentially a bad actor.
- carwyn 5y agoVery similar to GitHub Flow is trunk based development: https://trunkbaseddevelopment.com/ https://trunkbaseddevelopment.com/