Branch naming conventions:

master: master branch, used only for release
develop: develop branch used for most main-line work
release: release branch used for candidate releases, with only bug fixes and no new features

Commit message conventions:

feat: a commit of the type feat introduces a new feature to the project
fix : a commit of the type fix patches a bug in the project
doc : a commit of the type doc adds documentation to the project
refactoring: a commit for restructuring the code