-
Notifications
You must be signed in to change notification settings - Fork 23
GIT development workflow
#Description This page will describe how we are working with development of new features, releases, bug fixing and also some git tips and trix.
No development work are made in master, we will merge the develop branch into master when it's time to do a new release.
This branch is based on a main release tag in master (like 5.3) when we need to fix bugs for a specific release. New bug fixing releases will be tagged in this branch with X.Y.Z. We will not merge a bugfix release back into master. (TBD - How should we get bugfixes back into dev?)
This is our main development branch where we receive pull-requests and are doing small improvements to the code base. When a feature branch is finished they will be merged into develop. When the development work are ready to be released the dev branch are merged into master.
When we are developing new features that should be done in a feature branch based on develop. When the feature are ready the branch will be merged into dev.
$ git checkout develop
$ git pull --rebase
$ git status # branch should be clean
$ git checkout -b feature/new-cool-feature