Branching Strategy

Branches

• Master branch: branch used for producing releases. Commits in this branch should not break compilation or introduce bugs.
• Feature branches: short-lived branches used e.g. for Pull Requests
• Maintenance branches, named after the stable release series e.g. "0.15". They are used to maintain older series of Stellarium, mostly to fix bugs

Try to keep a linear git history on master

• merge commits to master should be avoided. Rebase your feature branches before pushing them to master
• if you need to merge some fixes from a maintenance branch to master, it is better to cherry pick the patches instead of merging