Two main branches,"master" and "develop".
The "develop" branch will reflect our edge environment.
Each feature should have it's own branch.
Branch out of "develop" instead of "master".
When a feature is complete merge back to "develop".
Branch out from "develop".
New features are not allowed, only bug fixes or release oriented tasks.
Once done merge both to "master" and "develop".
Don't forget to tag "master" once merged.
Versioning standard for our releases.
Major.Minor.Patch