Branches are diverging, development model is instable
Right now we are having three mainlines to maintain:
- master
- develop
- fix/21
As found in !9 (comment 10323) the choice to split between develop and master may not have been the best in the long term, but it helped to get past short term issues.
The basic principle in making usable systems is to have sane defaults. This branching model makes that mistake from the very beginning by not using the master branch for something that a developer who clones the repository would expect it to be used, development.
Using individual (long lived) branches for features also make it harder to ensure that everything works together when changes are merged back together.
- Do we need regular, timed releases from
develop
tomaster
to ensure a stable working base? - Should we keep them in sync as much as possible, and which criteria can we formulate to test validity of a MR?