| ... | ... | @@ -4,3 +4,15 @@ Collection of ideas and proposals for esm-developers guidelines. |
|
|
|
* working with feature branches
|
|
|
|
* developer branch for testing
|
|
|
|
* master branch is always stable
|
|
|
|
|
|
|
|
# GitLab workflow
|
|
|
|
* Create issue for new feature or bugfix
|
|
|
|
* Describe the purpose of the new feature or give a bug report
|
|
|
|
* Create a merge request for this issue (to be merged into developer branch ???)
|
|
|
|
* Checkout the feature branch for this issue
|
|
|
|
* Develop the new feature or do a bugfix
|
|
|
|
* Test new feature or the bugfix
|
|
|
|
* Commit and pull changes to the remote feature branch
|
|
|
|
* (Let feature branch be merged into the developer branch ???)
|
|
|
|
* Let someone else test the new feature or bugfix (e.g. standard tests on the developer branch ???)
|
|
|
|
* 'Deployment' of developer branch by merging it into the master branch |
