Update readme and pre-commit

2017-11-25 21:56:07 +02:00
parent ec6051d3d6
commit 2b2d635cb0
4 changed files with 1930 additions and 8 deletions
@@ -76,12 +76,7 @@ pip install -r requirements.production.txt

 ## Development workflow

-When pulling changes from the server, use `rebase` instead of `merge` for a nice and clean linear history.
-
-Example of pulling with rebase:
-```
-git pull --rebase
-```
+Do not use `rebase` when pulling or merging changes. Rebasing transforms the commit history and makes it appear more linear. This is a plus e.g. when working with a few people, but in this project traditional merging is recommended for clarity.

 When you start working on a feature, create a feature branch for your changes. These feature branches should be prefixed with `feature`.