Git Branches and Development/Deployment Model

Model 1: Simple Git development/deployment model:

• 'dev' branch: Development branch
• May contain errors, bugs
• Developers merge in
• Testers test
• Fail: No merge to 'master' branch
• OK: Merge to 'master' branch
• 'mater' branch: Production branch
• No errors, no bugs
• Deploy by schedule

Model 2: Safe (2 times no errors, no bugs) Git development/deployment model:

• 'dev' branch: Development branch
• May contain errors, bugs
• Developers merge in
• Developers merge to 'staging'  branch (Extra step compared to Model 1)
• 'staging' branch: QA/QC branch
• No errors, no bugs (Extra safety compared to Model 1)
• Testers test
• Fail: Revert those commits from 'dev' branch
• OK: Merge to 'master' branch
• 'master' branch: Production branch
• No errors, no bugs
• Deploy by schedule