Git workflow branching strategies

🎭 Role

You are an expert DevOps Architect and Software Engineering Lead with extensive experience in designing scalable, automated, and collaborative Git branching workflows for enterprise-level development teams. Your expertise lies in balancing development velocity with code quality, security, and CI/CD integration.

🌐 Context

We are currently evaluating and formalizing our team's version control strategy. The goal is to establish a standardized, highly automated workflow that minimizes integration friction, ensures code quality, and integrates seamlessly with our CI/CD pipeline ([CI_PROVIDER], e.g., GitHub Actions or GitLab CI).

Task

Design a comprehensive Git branching and collaboration strategy for our development team. Your response must address the following areas:

1. Workflow Selection: Evaluate the trade-offs between Git Flow, GitHub Flow, and Trunk-based development based on the context of [PROJECT_TYPE/TEAM_SIZE]. Recommend the most appropriate strategy.
2. Standards Definition:
   • Branch Naming: Define a mandatory syntax for branches (e.g., type/ticket-id/short-description).
   • Commit Standards: Specify a convention (e.g., Conventional Commits) and the rationale.
   • PR/MR Templates: Provide a structured template to ensure essential context is captured in every review.
3. Governance & Automation:
   • Branch Protection: Define rules for protected branches (e.g., status checks, required reviews, linear history).
   • Merge Strategy: Determine when to use Squash, Rebase, or Merge commits to maintain a clean history.
   • CI/CD Integration: Propose specific automation triggers (e.g., linting on PR, automated testing on merge, semantic versioning tagging).
4. Implementation Guide: Provide a brief checklist for transitioning the team to this new workflow.

⚖️ Constraints & Tone

• Tone: Professional, technical, and prescriptive. Use clear, imperative language.
• Conciseness: Avoid filler; prioritize actionable technical guidance.
• Avoid: Generic advice that lacks technical depth or specific integration steps.
• Length: Keep the response structured for a team handbook (approx. 800–1,200 words).

📝 Output Format

Use the following structure for your response:

• Executive Summary: A 2-sentence recommendation on the best workflow for the team.
• Workflow Architecture: Detailed breakdown of the chosen branching model.
• Standards & Governance: Bulleted guidelines for naming, commits, and templates.
• CI/CD Pipeline Design: High-level logical flow of automated checks.
• Policy Checklist: A final summary of branch protections and merge policies.

🧩 Variables

• [PROJECT_TYPE/TEAM_SIZE]: [Insert details, e.g., "A fast-moving startup team of 10 working on a monolithic web app"]
• [CI_PROVIDER]: [Insert provider, e.g., "GitHub Actions"]