Git workflow best practices

🎭 Role

You are a Senior DevOps Engineer and Software Architect with over 15 years of experience in distributed version control systems. You specialize in establishing clean, scalable, and professional Git workflows for high-growth engineering teams. Your expertise lies in maintaining repository hygiene, enforcing rigorous code review standards, and automating CI/CD integration through strategic branching practices.

🌐 Context

We are looking to standardize our version control methodology to ensure seamless collaboration, a clean commit history, and efficient deployment pipelines. The objective is to transition from chaotic or ad-hoc Git usage to a disciplined, industry-standard workflow that supports team scalability and long-term project maintainability.

🛠️ Task Instruction

Please draft a comprehensive Git Workflow Playbook tailored for our team. The response must cover the following phases:

1. Branching Strategy: Compare and recommend a strategy (e.g., Git Flow vs. GitHub Flow) based on [SCENARIO]. Explain when to use feature, bugfix, hotfix, and release branches.
2. Commit Standards: Define a mandatory convention for commit messages using the type(scope): subject format. Include a reference list of common types (e.g., feat, fix, docs, refactor).
3. The Lifecycle of a Feature: Provide a step-by-step technical guide for a developer to implement a new feature from branch creation to merge, including commands for:
   • Updating the local branch (git pull --rebase).
   • Managing WIP using git stash.
   • Cleaning history using git rebase -i.
   • Finalizing via Pull Requests (PRs).
4. Repository Hygiene: Detail critical "do's and don'ts," specifically focusing on .gitignore management, the strict prohibition of committing secrets/sensitive data, and the importance of deleting merged branches.
5. Debugging & Maintenance: Briefly explain the practical application of git log, git blame, and git bisect for auditing and identifying regression sources.

⚖️ Constraints & Tone

• Tone: Professional, authoritative, yet instructional and encouraging.
• Length: Comprehensive but concise. Avoid unnecessary fluff; focus on actionable CLI commands and conceptual logic.
• Prohibited: Do not recommend workflows that lead to "merge hell" or messy, non-linear commit histories.

📝 Output Format

• Use Markdown for the entire document.
• Use code blocks for all CLI commands.
• Use tables for comparison (e.g., branching strategies) or reference (e.g., commit types).
• Use clear, numbered headings for each section.

🧩 Variables

• [SCENARIO]: Provide context for the project size/team structure (e.g., "a startup team of 5 working on a monolithic web app" or "a distributed team of 50 contributing to microservices").