managing-git

1# Managing Git
2 
3### When to Load
4 
5- **Trigger**: Branching strategies, commit workflows, pull requests, merge conflicts, version control questions
6- **Skip**: Tasks that do not involve git operations
7 
8## Feature Development Workflow
9 
10Copy this checklist and track progress:
11 
12```
13Feature Development Progress:
14- [ ] Step 1: Create feature branch from main
15- [ ] Step 2: Make changes with atomic commits
16- [ ] Step 3: Rebase on latest main
17- [ ] Step 4: Push and create PR
18- [ ] Step 5: Address review feedback
19- [ ] Step 6: Merge after approval
20```
21 
22## Branching Strategies
23 
24### GitHub Flow (Recommended for most projects)
25 
26```
27main ──●────●────●────●────●── (always deployable)
28        \          /
29feature  └──●──●──┘
30```
31 
32- `main` is always deployable
33- Feature branches from main
34- PR + review + merge
35- Deploy after merge
36 
37### Git Flow (For release-based projects)
38 
39```
40main     ──●─────────────●────── (releases only)
41            \           /
42release      └────●────┘
43                 /
44develop  ──●──●────●──●──●──
45            \     /
46feature      └──●┘
47```
48 
49## Commit Conventions
50 
51### Conventional Commits Format
52 
53```
54<type>(<scope>): <description>
55 
56[optional body]
57 
58[optional footer(s)]
59```
60 
61### Types
62 
63| Type       | Description                                         |
64| ---------- | --------------------------------------------------- |
65| `feat`     | New feature                                         |
66| `fix`      | Bug fix                                             |
67…