LinuxGSM uses the GitFlow method (mostly) of releases. Relying on
GitFlow branching model
For further reading on the GitFlow model read the following article.
masterbranch will be the stable release branch. The
developbranch is for developing stable code. All code is to be developed in a
hotfixfor urgent fixes.
masterbranch is where the stable release is kept. Only code that has gone via the
developcan be merged here and goes through a release process. It is very important that code there has been tested and is stable as it is used in production.
developbranch brings together all the
featurebranches ready to be tested to become the next stable release. Developers should use
developas the base when creating a branch.
A feature branch is a development branch that is used while code is being actively worked on by developers. A feature branch should normally relate to an existing issue in GitHub. The feature branch should refer to the issue number and a word or two describing the issue, allowing other developers to know what issue branch related to and helps with housekeeping.
Once a feature is ready to be merged in to
developa pull request is to be raised to allow the feature to be reviewed.
The branch naming convention is less of an issue for developers who have forked the project and submitted a pull request. However, it is recommended that the standard is used.
hotfixbranch is identical to the
featurebranch but instead is used for urgent fixes that need to be applied to master.
When code from the
developbranch is ready for release it is split off into a
releasebranch will not have any more features added to it. It is then tested and any bugs fixed it will be released into
masterand tagged as a version number. The release will also be merged back into the
It is also a good idea to start using Git Kracken as the git client. It is a little more complex that GitHub Desktop but will give you a much better understanding of the development process.