Salesforce Decode
Salesforcedecode
Back to questions
Salesforce ArchitectureAdvanceddevopsbranchinggovernance

Design enterprise metadata branching strategy for multi-team Salesforce development

Real World Scenario

Eight scrum teams deploy conflicts overwriting each other flows; need branching strategy without blocking velocity.

Expected Answer

• Trunk-based short-lived feature branches max 2 days • Package-based ownership team A owns namespace pkg_team_a • CI merge conflict detection metadata overlap alert • Release train weekly prod deploy coordinated • Hotfix branch exception process merge back trunk same day • Environment promotion dev integration UAT prod automated • Code ownership CODEOWNERS file mandatory review

Follow-Up Questions & Answers

Click to expand — each follow-up includes a direct, interview-ready answer

Main difference: use case and scale. Trunk-based short-lived feature branches max 2 days. Package-based ownership team A owns namespace pkg_team_a. Pick based on your integration pattern and team capability. Multi-team Salesforce without package boundaries or trunk discipline guarantees merge hell. Optimize for scale and operational observability.

Architect Perspective

Multi-team Salesforce without package boundaries or trunk discipline guarantees merge hell.