Team Workflow

Level: Intermediate

ℹ️ What You'll Learn

• Team workflow patterns
• Branch organization
• Code review process
• Collaboration practices
• Conflict prevention

Workflow Pattern - Git Flow

main (stable, production)
├── hotfix/critical-bug
│   └── Merge → main + develop
└── release/v1.0
    └── Final testing
    
develop (integration)
├── feature/student-mgmt
├── feature/exam-mgmt
└── feature/fee-module

Hotfix (urgent):
hotfix/security-fix
└── Merge → main + develop

Process:

1. Start feature: git checkout -b feature/name
2. Develop and test
3. Create Pull Request
4. Code review
5. Merge to develop
6. Release cycle
7. Merge develop → main

Branch Naming

feature/student-management
bugfix/fee-calculation-error
hotfix/security-vulnerability
release/v1.0.0

Clear naming = easy to track.

Pull Request Workflow

1. Push feature branch
2. Create PR on GitHub
3. Title: "Add student registration form"
4. Description: What changed, why
5. Assign reviewers
6. Reviewers approve/request changes
7. Merge when approved

Code Review Checklist

• Tests added/updated
• Comments clear
• No hardcoded values
• Naming conventions followed
• Performance acceptable
• Security considered

Conflict Prevention

Pull before work:

git pull  # Get latest
git checkout -b feature/xyz
# Work on isolated branch

Communicate:

• "I'm working on StudentService"
• Avoid same files simultaneously

SMS Team Example

# Alice works on students
git checkout -b feature/student-registration

# Bob works on fees (different code)
git checkout -b feature/fee-payment

# Both push, create PRs
git push origin feature/student-registration
git push origin feature/fee-payment

# Reviewers approve
# Merge to develop
# No conflicts (different files)

# Weekly release
git checkout release/v1.0
git merge develop
# Test, then merge to main

Shared Responsibility

• Main: Only production-ready
• Develop: Tested, reviewed
• Feature: Work-in-progress
• Don't rewrite history on shared branches

Key Takeaways

• Workflow = process for team
• Branch per feature = isolation
• Pull Request = code review
• Communicate = prevent conflicts

💡 Collaboration Tip

Clear communication prevents 80% of conflicts.

⚠️ Team Mistakes

1. Force pushing to shared branch
2. Large commits (hard to review)
3. No communication (parallel work)
4. Skipping tests before merge

🤖Use AI to Learn Faster

Use ChatGPT, Claude, or Copilot to go deeper on Team Git Workflow. Try these prompts:

• "What's a good branching strategy?"
• "How do we prevent merge conflicts?"
• "What should a code review check?"
• "Quiz me on team workflows"

💡 Tip: After reading this article, paste your own code into AI and ask "What could go wrong here and why?" — fastest way to find edge cases and deepen understanding.