Feature Branching
Each feature or task gets its own branch to isolate development work.
- Branch off from main or develop
- Short-lived, merged back after completion
- Ensures stability of main branch
Release Branching
Used to prepare for production releases, allowing final testing and fixes.
- Branch off from develop
- Apply bug fixes and minor changes
- Merged into main and develop after release
Hotfix Branching
Critical fixes for production issues are done in hotfix branches.
- Branch off from main
- After fix, merge back into main and develop
Trunk-Based Development
Frequent integration into main branch to maintain continuous delivery.
- Short-lived feature branches or direct commits to main
- Automated tests ensure stability
- Reduces long-lived branch conflicts
← Back to Lesson 3: Version Control with Git