managing-gitlisted

# Managing Git ### When to Load - **Trigger**: Branching strategies, commit workflows, pull requests, merge conflicts, version control questions - **Skip**: Tasks that do not involve git operations ## Feature Development Workflow Copy this checklist and track progress: ``` Feature Development Progress: - [ ] Step 1: Create feature branch from main - [ ] Step 2: Make changes with atomic commits - [ ] Step 3: Rebase on latest main - [ ] Step 4: Push and create PR - [ ] Step 5: Address review feedback - [ ] Step 6: Merge after approval ``` ## Branching Strategies ### GitHub Flow (Recommended for most projects) ``` main ──●────●────●────●────●── (always deployable) \ / feature └──●──●──┘ ``` - `main` is always deployable - Feature branches from main - PR + review + merge - Deploy after merge ### Git Flow (For release-based projects) ``` main ──●─────────────●────── (releases only) \ / release └────●────┘ / develop ──●──●────●──●──●── \ / feature └──●┘ ``` ## Commit Conventions ### Conventional Commits Format ``` <type>(<scope>): <description> [optional body] [optional footer(s)] ``` ### Types | Type | Description | | ---------- | --------------------------------------------------- | | `feat` | New feature | | `fix` | Bug fix | | `docs`