Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-20 08:33:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs: add worklow docs

Browse Source
This commit is contained in:
Karl-Philipp Wulfert
2018-11-30 17:09:20 +01:00
parent c3182caba5
commit 7981463255
13 changed files with 289 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
project-docs/workflow/MERGING.md Normal file
View File

@@ -0,0 +1,11 @@
# Merging & merge requests
Once development of an [issue](ISSUES.md) on a [branch](BRANCHING.md) is completed the merge request becomes relevant. It also can be used during development for continuous reviews and iterative improvements.
A merge request can also gather the work of multiple issues.
Merge requests are used to merge the changes to the main branches (`master`, `develop`). Every merge request needs to be reviewed/commented by at least 2 other developers before they can be accepted. This ensure that all guidelines are followed and that the scope of the issue is matched.
## Further resources
* [Commits](COMMITS.md)