Last Updated: 1/28/2026
Git Workflow
How we use Git at Acme.
Branch Naming
feature/JIRA-123-short-description
bugfix/JIRA-456-fix-login-error
hotfix/JIRA-789-critical-fixCommit Messages
Follow Conventional Commits:
feat(auth): add OAuth2 support
fix(api): handle null response
docs(readme): update setup instructions
chore(deps): update dependenciesTypes
| Type | Description |
|---|---|
feat | New feature |
fix | Bug fix |
docs | Documentation |
chore | Maintenance |
refactor | Code refactoring |
test | Adding tests |
Pull Requests
Every PR requires:
- At least 1 approval
- Passing CI checks
- No unresolved comments
- Updated tests
PR Title Format
[JIRA-123] Brief descriptionMerging
We use squash merge to keep history clean.
# Never do this
git merge --no-ff
# We do this (via GitHub)
Squash and merge