using-git

## Overview

Git workflow conventions for consistent, safe version control operations. Covers conventional commits, branch naming, PR templates, and conflict resolution.

## Conventional Commits

Format: `type(scope): description`

| Type | Use When |
|------|----------|
| `feat` | New feature |
| `fix` | Bug fix |
| `docs` | Documentation only |
| `refactor` | Code change (no feature/fix) |
| `test` | Adding/updating tests |
| `chore` | Maintenance, deps, config |
| `perf` | Performance improvement |
| `style` | Formatting (no code change) |

**Examples:**
```
feat(auth): add JWT token refresh
fix(api): handle null response from payment gateway
docs(readme): update installation instructions
refactor(utils): extract date formatting to helper
test(auth): add integration tests for login flow
chore(deps): bump typescript to 5.3.0
```

**Multi-line format:**
```
type(scope): short description

- Bullet point explaining what changed
- Another bullet point if needed
- Reference issue: closes #123
```

## Branch Naming

Format: `username/type/slug`

| Component | Source | Rules |
|-----------|--------|-------|
| username | `whoami` | System username |
| type | feat/fix/hotfix/chore | Based on work type |
| slug | Description | kebab-case, max 30 chars |

**Examples:**
- `roderik/feat/user-authentication`
- `roderik/fix/null-pointer-login`
- `roderik/hotfix/critical-security`
- `roderik/chore/bump-dependencies`

## PR Templates

Select template based on primary commit type:

| Commit Type | Template | Focus |
|-------------|----------|-------|
| `feat` | pr-feature.md | Summary, Why, Design, Changes, Test |
| `refactor` | pr-refactor.md | Summary, Why, Changes, Impact |
| `fix`, other | pr-body.md | Summary, Why, Changes, Test |

Templates are in `templates/` directory.

## Merge vs Rebase

| Situation | Use | Why |
|-----------|-----|-----|
| Shared branch | Merge | Don't rewrite shared history |
| Solo feature | Rebase | Clean linear history |
| Already pushed | Merge | A