git-workflow
Git branching and commit message conventions
Git Workflow
Branch naming
- Feature branches:
feat/<short-description> - Bug fixes:
fix/<short-description> - Chores:
chore/<short-description>
Commit messages
Use conventional commits: type(scope): description
Types: feat, fix, docs, style, refactor, test, chore
Examples:
feat(auth): add OAuth2 login flowfix(api): handle null response from upstream
Rules
- Never force-push to
mainormaster - Always create a branch for changes — never commit directly to main
- Keep commits atomic — one logical change per commit
- Write commit messages in imperative mood ("add feature" not "added feature")
- Rebase feature branches on main before merging