improve text authored by Boman Romain's avatar Boman Romain
......@@ -202,10 +202,10 @@ gitk --all
```
Create a "merge request" (instead of pushing to `master`):
* Do this on GitLab.
* First, merge master into your branch.
* Check that your code works and you haven't broken something (run some tests)
* First, merge `master` into your branch.
* Check that your code works correctly and that you have not broken something (run the tests and check the results!)
* Write some text explaining what you have done in your branch.
* The other developers will receive an e-mail telling them that you want to update master.
* The other developers will receive an e-mail telling them that you want to update `master`.
* Wait for their comments and agreement before merging the merge request.
Tag your project for a deadline (a "tag" is a string which identifies a particular commit of your project):
......
......