I always get confused when it comes to git flow - from where to branch and merge. So, I kept the below cheat sheet.
- A
develop branch is created from master
- A
release branch is created from develop
- Feature
branches are created from develop
- When
a feature is complete it is merged into the develop branch
- When
the release branch is done it is merged into develop and master
- If
an issue in master is detected a hotfix branch is created from master
- Once
the hotfix is complete it is merged to both develop and master
pic courtesy -> https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
