- Having at least 2 branches:
master
and develop
master
branch has only released code
develop
branch has only stable code
- When working on new feature it is better to create brunch like:
> git checkout -b develop-my-new-cool-feature
- After work on feature in separate branch is done, it is better to merge it with develop (as other developers could push their features there):
> git merge develop
- Before release it is good to create tag with:
> git tag -a "tag name - e.g. v2.1" -m "What is new in this release"
> git push --tags
- After tag for release is added, it is good practice to merge code from develop to master before starting work on new release:
> git checkout master
> git merge develop