Simplify branch management #2160
olafmersmann
started this conversation in
General
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Currently we have a convoluted workflow with a
master
,release
(really a staging/pre-release branch) anddevelopment
branch in addition to feature branches. I would be in favor of dropping thedevelopment
andrelease
branches and adopting a "live at head" development model.All (major) changes would be developed in a separate feature branch (as we already do) and merged into
master
once all tests pass via squashing pull request. Squashing the commits leads to a cleaner history for themaster
branch but isn't a must. Official releases would still be marked by tags.Am I missing some advantages of the current model compared to the simpler
master
-only model?Beta Was this translation helpful? Give feedback.
All reactions