Git Flow (Detailed)
Main Branches
- main → production
- develop → integration branch
Feature Branch
git checkout develop git checkout -b feature-login
Used to develop new features.
Merge Feature to Develop
git checkout develop git merge feature-login
Release Branch
git checkout -b release-1.0 develop
Used to prepare release.
Merge Release to Main
git checkout main git merge release-1.0 git tag v1.0
Hotfix Branch
git checkout main git checkout -b hotfix-1.0.1
Merge Hotfix
git checkout main git merge hotfix-1.0.1 git checkout develop git merge hotfix-1.0.1
Advantages
- Structured workflow
- Good for large teams
- Supports releases and hotfixes
Source: sureshtechlabs.com