Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify branching model #2203

Open
pombredanne opened this issue Sep 2, 2020 · 2 comments
Open

Simplify branching model #2203

pombredanne opened this issue Sep 2, 2020 · 2 comments

Comments

@pombredanne
Copy link
Member

We de-facto use the gitflow branching model at https://nvie.com/posts/a-successful-git-branching-model/
BUT the "master/develop" branches are making double duty and serve not purpose.
In practice all the code merged in develop is immediately usable in production.
Therefore I suggest we switch to a simpler branching model which is the de facto model we use today:

  1. one single default branch called "main" where only merges are done
  2. features are pushed in other branches and merged when fully ready in "main"
  3. now and then we tag and cut a formal release from "main"
  4. exceptionally and likely never we can branch from a tag to backport a hotfix just there
@steven-esser
Copy link
Contributor

👍 I am all for this change

@mjherzog
Copy link
Member

mjherzog commented Sep 2, 2020

I am not any expert in this area. The assertion that "all code merged in develop is immediately usable in production" seems highly optimistic over any longer period of time. I think that we need to get back into a cadence of more frequent minor releases.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants