Adopt git flow - Githubissues

tiliado / nuvolaplayer

Nuvola Player - Tight integration of web-based media streaming services with your desktop

https://nuvola.tiliado.eu/

BSD 2-Clause "Simplified" License

334 stars 27 forks source link

Adopt git flow #648

Closed jiri-janousek closed 4 years ago

jiri-janousek commented 4 years ago

Branches:

Stable branch release-4.x: Code for immediate release. Stable flatpak builds (repo branch stable).
Development branch master: New features are merged here. Development builds (repo branch master).

Merging:

New features are merged into master.
Hot-fixes are merged into both master and release-4.x.
When a new release is ready, master is merged into release-4.x.

After Nuvola 5 fork:

Nuvola 4 stable branch: release-4.x
Nuvola 4 development branch: develop-4.x forked from master.
Nuvola 5 development branch: master.
Nuvola 5 stable branch: release-5.x forked from master when Nuvola 5 is ready for public release.

jiri-janousek commented 4 years ago

Follow-up: #649