@ -28,6 +28,7 @@ git checkout master
git merge --no-ff dev # using the default commit message is fine
git push origin master
git checkout dev
git merge master
git push origin dev
```