The very popular and standardized methodology for working with Git is simply called GitFlow. Here is a brief description of the main rules of that flow:
- There is a main working branch, usually called develop, where all the development for the latest version of the application occurs.
- New project features are implemented in separate branches called feature branches that always start from the develop branch. When work on a feature is finished and the code is properly tested, this branch is merged back to develop.
- When the code in develop is stabilized (without known bugs) and there is a need for a new application release, a new release branch is created. This release branch usually requires additional tests (extensive ...
