Git Workflow & Branching Strategy

Set up a Git workflow and branching strategy for my project.

Team size: [SOLO / 2-5 / 5-10 / 10+]
Project type: [WEB APP / MOBILE / LIBRARY / MICROSERVICES]

Deployment: [CONTINUOUS / SCHEDULED RELEASES / MANUAL]
Current Git usage: [BASIC / INTERMEDIATE / ADVANCED]

Provide:
1. **Branching Model**: Git Flow, GitHub Flow, or Trunk-Based — which for my situation
2. **Branch Naming**: Convention for feature, bugfix, hotfix, and release branches
3. **Commit Messages**: Conventional commits format with examples
4. **Pull Request Template**: A PR template with checklist
5. **Code Review Process**: How to review and approve PRs
6. **Merge Strategy**: Merge, squash, or rebase — when to use each
7. **Release Process**: How to manage releases and versioning
8. **Hotfix Procedure**: Emergency fix process
9. **CI/CD Integration**: How the workflow connects to deployment
10. **Common Pitfalls**: Git mistakes to avoid and how to recover from them

Set up a Git workflow and branching strategy for my project.

Team size: [SOLO / 2-5 / 5-10 / 10+]
Project type: [WEB APP / MOBILE / LIBRARY / MICROSERVICES]
Deployment: [CONTINUOUS / SCHEDULED RELEASES / MANUAL]
Current Git usage: [BASIC / INTERMEDIATE / ADVANCED]

Provide:
1. **Branching Model**: Git Flow, GitHub Flow, or Trunk-Based — which for my situation
2. **Branch Naming**: Convention for feature, bugfix, hotfix, and release branches
3. **Commit Messages**: Conventional commits format with examples
4. **Pull Request Template**: A PR template with checklist
5. **Code Review Process**: How to review and approve PRs
6. **Merge Strategy**: Merge, squash, or rebase — when to use each
7. **Release Process**: How to manage releases and versioning
8. **Hotfix Procedure**: Emergency fix process
9. **CI/CD Integration**: How the workflow connects to deployment
10. **Common Pitfalls**: Git mistakes to avoid and how to recover from them