Git for Teams: Workflows, Conventions and Best Practices

In this tutorial, you'll learn about Git for Teams: Workflows, Conventions and Best Practices. We cover key concepts, practical examples, and best practices.

Team Git conventions are agreed-upon rules for commit messages, branch naming, and code review that reduce friction and make project history readable.

In this tutorial, you'll learn how to establish Git conventions and workflows that make team collaboration smooth and predictable. Without conventions, teams face inconsistent commit messages, confusing branch names, merge conflicts, and miscommunication. By the end, you'll implement commit conventions, branch naming, code review workflows, and automation that keeps your team aligned.

flowchart TD
  A[Team conventions] --> B[Branch naming]
  A --> C[Commit messages]
  A --> D[Pull request workflow]
  A --> E[Code review process]
  B --> F[feat/login, fix/payment, chore/ci]
  C --> G[feat(auth): add OAuth support]
  D --> H[Branch -> PR -> Review -> Merge]
  E --> I[At least 1 approval, no self-merge]

Commit Message Convention

Adopt the Conventional Commits specification:

<type>(<scope>): <description>

[optional body]

[optional footer]

Types:

Branch Naming Convention

Consistent branch names make project navigation easier:

<type>/<short-description>

Examples:

• feat/user-authentication
• fix/payment-null-pointer
• chore/update-dependencies
• docs/api-reference
• refactor/database-layer

Pull Request Workflow

Standard PR workflow:

1. Create branch from main
2. Make changes and commit
3. Push branch and open PR
4. Request review from team
5. Address review feedback
6. Merge (squash or merge commit)
7. Delete branch

PR description template:

## What does this PR do?
[Brief description]

## Related Issue
Closes #[issue number]

## Checklist
- [ ] Tests added/updated
- [ ] Documentation updated
- [ ] Code follows style guide
- [ ] Self-review completed

Code Review Best Practices

Automation for Teams

Protect branches with rules:

Use GitHub Actions to enforce conventions:

name: Enforce Commit Convention
on: pull_request
jobs:
  check-commit:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: Check commit messages
        run: |
          git log --format=%s ${{ github.event.pull_request.base.sha }}..HEAD |
          while read msg; do
            if ! echo "$msg" | grep -qE "^(feat|fix|docs|style|refactor|test|chore)(\(.+\))?: .+"; then
              echo "Bad commit: $msg"
              exit 1
            fi
          done

Common Errors

Practice Questions

Challenge

Design a complete Git convention document for a team of 8 developers. Include: commit message format (Conventional Commits), branch naming convention, PR workflow steps, code review guidelines (with time expectations), branch protection rules, and automation checks. Write this as a CONTRIBUTING.md file.

Real-World Task

Set up a new repository with full team workflow automation. Configure branch protection on main requiring PRs, one approval, and passing CI. Create issue and PR templates. Add a CI workflow that lints code and validates commit messages. Add a CODEOWNERS file for team review assignments. Finally, enforce squash merging with Conventional Commits. This complete setup mirrors the standard DodaTech project template used for all internal tools.

Built by the developers of Doda Browser, DodaZIP, and Durga Antivirus Pro.