Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-10 19:52:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs: describe how to tidy up commits before merging

Browse Source
This commit is contained in:
Michel Jonathan Schmitz
2019-02-07 10:26:53 +00:00
parent e0169daa00
commit 11fa530d7f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project-docs/workflow/MERGING.md
View File

@@ -6,6 +6,9 @@ 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.
Before any merge of an `issue`-branch into the according `master`-branch, the commits of the `issue`-branch shall be tidied up.
Unstage your commits from the `issue`-branch (`git reset master`). Create your new commit(s) and push them to the remote repository (`git push --force`).
## Further resources
* [Commits](COMMITS.md)