Git-Flow
DevOpsImplements the git-flow branching model. Handles feature branches, release branches, hotfix branches, and proper merging workflows between main, develop, and supporting branches.
Branch Architecture
- Main/Master: Production-ready code only, every commit = new release
- Develop: Integration branch for next release, nightly builds
- Feature: New features branch from and merge back to develop
- Release: Preparation for production, merges to main AND develop
- Hotfix: Emergency fixes from main, merges to main AND develop
Operations
- Start Feature: Creates feature/* branch from develop
- Finish Feature: Merges back to develop with --no-ff
- Start Release: Creates release-* branch from develop
- Finish Release: Merges to main (tagged) and back to develop
- Hotfix: Emergency branch from main, merges to both main and develop