-
Notifications
You must be signed in to change notification settings - Fork 106
Branching model
DocDokuPLM is an Open Source project. So everybody can fork and then propose modifications through a pull request. To be able to keep the repository clear and understandable to everyone, we introduce a convention for the branches.
This is the main branch containing all the tested modifications and approved features. Actually master is more an anemic branch that holds project milestones.
This branch is used for the development of the next release.
Every feature is developed in its own branch prefixed by "feature-". When completed this branch will be merged into dev branch.
Created to fix a critical bug, should be prefixed by "hotfix-". This branch will be merged back into dev and master.
Created and prefixed by "release-" in order to prepare the next major version. Once finished merged back into master and optionally into dev if some bugs have been fixed.