Branching Model - androidWG/SmartLyrics GitHub Wiki

After the Great testing-layout failure of July 2020, it was decided that a branching model needed to be adopted. In this case, a (very) quick Google search showed the apparently famous git-flow model, described here.

Since this project doesn't even have a production build yet, a simplified version of git-flow will be used:

• master and develop are permanent branches on origin
• All work is done on the develop branch. The master branch reflects the latest build version.
• Release, feature and hotfix branch model is not followed. Work done locally is organized solely on the developers' discretion.
• The develop branch is merged directly to master.

The full git-flow model will be adopted after the first Open Beta release.