Git for Engineers›Team Workflows

Team Workflows

Code review, PR etiquette, and keeping history clean in a team.

~15 min read

Team Workflows

Pull Request best practices

  • Small PRs (< 400 lines) get better reviews
  • Write a clear description: what, why, how to test
  • Link to the issue/ticket

Keeping history clean

  • Squash fixup commits: git rebase -i
  • Use conventional commits: feat:, fix:, chore:
  • Delete merged branches

Conflict resolution

git fetch origin
git rebase origin/main
# fix conflicts
git rebase --continue