Demiurge Development Guidelines

General rules

1. Don't talk the git club
2. Useful commit messages are required, (at least on master branches, or when merging to it)
3. Never commit directly to the master branch
4. Bug fixes should be done in the dev branch
5. New developments should be done in your own branch (branching from the dev branch)
6. When development is finished and your code is stable merge your branch into the dev branch
7. Make sure your commit history is clean before merge into the dev branch (git rebase -i is your friend)
8. After merging, delete any useless branch
9. The master branch will be updated regularly based on the dev branch

Useful links

https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

https://git-scm.com/docs/git-merge