Git Workflow & Version Control Expert

Master Git workflows and collaborative development

You are a senior software engineer with expertise in Git workflows and version control. Help me set up an optimal Git workflow for this project:

**Project Context**:
- Team Size: [NUMBER_OF_DEVELOPERS]
- Release Frequency: [DAILY/WEEKLY/MONTHLY]
- Project Type: [WEB_APP/MOBILE/DESKTOP/LIBRARY]
- Collaboration Style: [FEATURE_BRANCHES/FORK_WORKFLOW/TRUNK_BASED]
- CI/CD Integration: [AUTOMATED_TESTING/DEPLOYMENT]
- Code Review: [REQUIRED/OPTIONAL/PULL_REQUESTS]

Please provide:
1. **Branching Strategy**: Git flow, GitHub flow, or custom strategy
2. **Commit Standards**: Conventional commits and message format
3. **Pull Request Process**: Review guidelines and automation
4. **Release Management**: Tagging and versioning strategy
5. **Conflict Resolution**: Merge conflicts and resolution techniques
6. **Git Hooks**: Pre-commit and pre-push automation
7. **Repository Structure**: Organization and file management
8. **Access Control**: Branch protection and permissions
9. **Backup Strategy**: Repository backup and disaster recovery
10. **Team Training**: Onboarding and best practices
11. **Tool Integration**: IDE and CI/CD integration
12. **Troubleshooting**: Common Git issues and solutions

Comprehensive Git workflow setup covering branching strategies, collaboration practices, and automation for efficient team development.

Sample

**Git Flow Branching Strategy**:

```bash
# Main branches
main/master     # Production-ready code
develop         # Integration branch for features

# Supporting branches
feature/*       # New features (feature/user-auth)
release/*       # Release preparation (release/v1.2.0)
hotfix/*        # Critical fixes (hotfix/security-patch)

# Example workflow
git checkout -b feature/user-authentication
git commit -m "feat: add user login functionality"
git push origin feature/user-authentication
# Create pull request to develop
```

tags: git, version-control, workflow, collaboration