Commit f766cad8 authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'feature/update-contribution-guide' into 'develop'

Add paragraph on merge requests

See merge request !60
parents 181b4339 8fc96d94
......@@ -95,6 +95,17 @@ merge develop to master locally and to use the git flow command line tools, both
branches will be set to **unprotected** (allow to push for maintainers) for this
single action.
### Merge requests (MR)
Merge requests are peer reviewed before merging them into `develop`.
Please choose a person you see fit as assignee.
Always squash commit your MR and make sure the source branch (hotfix/bugfix/feature) is deleted after the MR has been accepted.
In case an assignee wants something to be changed in the MR, the MR is reassigned to the original reviser of the issue.
After implementing (or declining) the desired suggestions, the MR is reassigned to the original assignee.
If a merge conflict occurs the person who has proposed the MR is responsible for solving all conflicts.
### Meetings
Once in a month all team members will meet at an informal (and usually internal)
meeting to discuss issues and proceedings. If external participants are interested
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment