From 11fa530d7f01f3eb74a63579f45732c973e7e5ee Mon Sep 17 00:00:00 2001 From: Michel Jonathan Schmitz Date: Thu, 7 Feb 2019 10:26:53 +0000 Subject: [PATCH] docs: describe how to tidy up commits before merging --- project-docs/workflow/MERGING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project-docs/workflow/MERGING.md b/project-docs/workflow/MERGING.md index ecc76d22..dd6901bd 100644 --- a/project-docs/workflow/MERGING.md +++ b/project-docs/workflow/MERGING.md @@ -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)