Gregory Savvidis gregorysav

## branching_strategies.md

      
              1 file
            
          
              0 forks
            
          
                0 comments
              
            
              0 stars
            
          
                gregorysav
                / branching_strategies.md
            
            
              Created
              January 26, 2025 11:06
            
          
Strategy
Feature Branches
Release Strategy
Merge Process
Deployment


GitFlow
Long-lived, cut from develop
Separate release branches for final prep
Two-step merge: develop and main
main branch is deployed after merging


GitHub Flow
Short-lived, cut from main
Direct from main branch for production
Continuous merges from feature_branch to main
main branch is deployed immediately post-merge


GitLab Flow
Short-lived, cut from main
Optional pre-production (test/staging), production
Merge to main, with optiona
Strategy	Feature Branches	Release Strategy	Merge Process	Deployment
GitFlow	Long-lived, cut from `develop`	Separate `release` branches for final prep	Two-step merge: `develop` and `main`	`main` branch is deployed after merging
GitHub Flow	Short-lived, cut from `main`	Direct from `main` branch for production	Continuous merges from `feature_branch` to `main`	`main` branch is deployed immediately post-merge
GitLab Flow	Short-lived, cut from `main`	Optional pre-production (test/staging), `production`	Merge to `main`, with optiona