Merge branch 'local-rda' into 'master'

Add merge request howto

See merge request core/python!3

README.md

@@ -82,3 +82,80 @@ After that you can import modules from the lib paths, searched in the following
 Store scripts here:
 
 - `bin/`
+
+## collaborating
+
+- Merge requests should be review from at least one other person
+- Only merge yourself if you are absolutely sure it does not break anything
+
+### feature request
+
+If you would like to have a new feature, script or module, open an [issue](https://gitlab.phys.ethz.ch/core/python/issues/new).
+
+- add **title** and  **description**
+- choose **assignee**: the person who should do it or `Unassigned`
+- choose **label**: `Feature request`
+- submit
+
+### bug report
+
+To report a bug, open an [issue](https://gitlab.phys.ethz.ch/core/python/issues/new).
+
+- add **title** and  **description**
+- choose **assignee**: the person who should do it or `Unassigned`
+- choose **label**: `Bug`
+- submit
+
+### contributing
+
+This gitlab repo will be cloned to many locations, and the `master` branch should always be **stable**. Therefore the `master` branch is protected. No one can push to it directly.
+
+To contribute create your own **local-<yourname>** branch or a **feature/bugfix** branch:
+
+```
+git checkout -b newfeature
+git push -u origin newfeature
+```
+
+Make your changes and push to your branch:
+
+```
+git add -A
+git commit
+git push
+```
+
+Git will show you the link to open a **pull request**:
+
+```
+remote: To create a merge request for local-rda, visit:
+remote:   https://gitlab.phys.ethz.ch/core/python/merge_requests/new?merge_request%5Bsource_branch%5D=newfeature
+```
+
+You can also go to [branches](https://gitlab.phys.ethz.ch/core/python/branches) and click **Merge request**.
+
+- add **description**: If it closes an issue write the issue nuber it fixes (`Fixes #1` / `Closes #1`)
+- add **assignee** (optional)
+- add **label**: `Feature` or `Fix`
+- submit
+
+Let someone review it and discuss. **Changes** shows the diff.
+
+Once it is ready to be merged:
+
+- merge it by clicking the green **Merge** button
+- remove source branch now with the **Remove Source Branch** button
+
+Pull the updated `master` branch (which now contains your work):
+
+```
+git checkout master
+git pull
+```
+
+You can now also safely remove your feature branch in your own git repo:
+
+```
+git branch -d newfeature
+```
+