We’re following Git Flow with almost default settings:
- production-ready code: master;
- ongoing development: develop;
- feature branches: feature/myfeautre_IZM-1234;
- release branches: release/vX.X.X.
The only exception is feature branch name should contain feature name and Jira ticket number.
Commit messages should look like this:
[IZM-1234 myfeature] Add really awesome feature.
There’s a Git hook that will adds a ticket number to your commit messages. To install it:
cd ~/izumi/izumi-app
ln -s -f ../../githooks/prepare-commit-msg .git/hooks/prepare-commit-msg
- A successful Git branching model (the original Git Flow description);
- git-flow cheatsheet.