superkit-mcp-server 1.2.4 → 1.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ARCHITECTURE.md +102 -102
- package/README.md +71 -71
- package/SUPERKIT.md +168 -168
- package/agents/code-archaeologist.md +106 -106
- package/agents/coder.md +90 -90
- package/agents/data-engineer.md +28 -28
- package/agents/devops-engineer.md +242 -242
- package/agents/git-manager.md +203 -203
- package/agents/orchestrator.md +420 -420
- package/agents/penetration-tester.md +188 -188
- package/agents/performance-optimizer.md +187 -187
- package/agents/planner.md +270 -270
- package/agents/qa-automation-engineer.md +103 -103
- package/agents/quant-developer.md +32 -32
- package/agents/reviewer.md +100 -100
- package/agents/scout.md +222 -222
- package/agents/tester.md +274 -274
- package/agents/ui-designer.md +208 -208
- package/build/__tests__/test_apply_prompt_args.js +104 -0
- package/build/index.js +106 -45
- package/build/tools/todoTools.js +39 -39
- package/build/tools/validators/__tests__/apiSchema.test.js +23 -23
- package/build/tools/validators/__tests__/convertRules.test.js +5 -5
- package/build/tools/validators/__tests__/frontendDesign.test.js +12 -12
- package/build/tools/validators/__tests__/geoChecker.test.js +19 -19
- package/build/tools/validators/__tests__/mobileAudit.test.js +12 -12
- package/build/tools/validators/__tests__/reactPerformanceChecker.test.js +17 -17
- package/build/tools/validators/__tests__/securityScan.test.js +6 -6
- package/build/tools/validators/__tests__/seoChecker.test.js +16 -16
- package/build/tools/validators/__tests__/typeCoverage.test.js +14 -14
- package/commands/README.md +122 -122
- package/commands/ask.toml +72 -72
- package/commands/brainstorm.toml +119 -119
- package/commands/chat.toml +77 -77
- package/commands/code-preview.toml +37 -37
- package/commands/code.toml +28 -28
- package/commands/content.toml +200 -200
- package/commands/cook.toml +77 -77
- package/commands/copywrite.toml +131 -131
- package/commands/db.toml +192 -192
- package/commands/debug.toml +166 -166
- package/commands/design.toml +158 -158
- package/commands/dev-rules.toml +14 -14
- package/commands/do.toml +117 -117
- package/commands/doc-rules.toml +14 -14
- package/commands/docs.toml +148 -148
- package/commands/fix.toml +440 -440
- package/commands/fullstack.toml +175 -175
- package/commands/git.toml +235 -235
- package/commands/help.toml +84 -84
- package/commands/integrate.toml +127 -127
- package/commands/journal.toml +136 -136
- package/commands/kit-setup.toml +40 -40
- package/commands/mcp.toml +183 -183
- package/commands/orchestration.toml +15 -15
- package/commands/plan.toml +206 -172
- package/commands/pm.toml +148 -148
- package/commands/pr.toml +50 -50
- package/commands/project.toml +32 -32
- package/commands/research.toml +117 -117
- package/commands/review-pr.toml +63 -63
- package/commands/review.toml +190 -190
- package/commands/scout-ext.toml +97 -97
- package/commands/scout.toml +79 -79
- package/commands/screenshot.toml +65 -65
- package/commands/session.toml +102 -102
- package/commands/skill.toml +384 -384
- package/commands/status.toml +22 -22
- package/commands/team.toml +56 -56
- package/commands/test.toml +164 -164
- package/commands/ticket.toml +70 -70
- package/commands/use.toml +106 -106
- package/commands/video.toml +83 -83
- package/commands/watzup.toml +71 -71
- package/commands/workflow.toml +14 -14
- package/package.json +35 -35
- package/skills/meta/README.md +30 -30
- package/skills/meta/api-design/SKILL.md +134 -134
- package/skills/meta/code-review/SKILL.md +44 -44
- package/skills/meta/code-review/checklists/pre-merge.md +25 -25
- package/skills/meta/code-review/workflows/architecture-pass.md +26 -26
- package/skills/meta/code-review/workflows/performance-pass.md +27 -27
- package/skills/meta/code-review/workflows/security-pass.md +29 -29
- package/skills/meta/compound-docs/SKILL.md +133 -133
- package/skills/meta/debug/SKILL.md +40 -40
- package/skills/meta/debug/templates/bug-report.template.md +31 -31
- package/skills/meta/debug/workflows/reproduce-issue.md +20 -20
- package/skills/meta/docker/SKILL.md +126 -126
- package/skills/meta/examples/supabase/SKILL.md +46 -46
- package/skills/meta/examples/supabase/references/best-practices.md +319 -319
- package/skills/meta/examples/supabase/references/common-patterns.md +373 -373
- package/skills/meta/examples/supabase/templates/migration-template.sql +49 -49
- package/skills/meta/examples/supabase/templates/rls-policy-template.sql +77 -77
- package/skills/meta/examples/supabase/workflows/debugging.md +260 -260
- package/skills/meta/examples/supabase/workflows/migration-workflow.md +211 -211
- package/skills/meta/examples/supabase/workflows/rls-policies.md +244 -244
- package/skills/meta/examples/supabase/workflows/schema-design.md +321 -321
- package/skills/meta/file-todos/SKILL.md +88 -88
- package/skills/meta/mobile/SKILL.md +140 -140
- package/skills/meta/nextjs/SKILL.md +101 -101
- package/skills/meta/performance/SKILL.md +130 -130
- package/skills/meta/react-patterns/SKILL.md +83 -83
- package/skills/meta/security/SKILL.md +114 -114
- package/skills/meta/session-resume/SKILL.md +96 -96
- package/skills/meta/tailwind/SKILL.md +139 -139
- package/skills/meta/testing/SKILL.md +43 -43
- package/skills/meta/testing/references/vitest-patterns.md +45 -45
- package/skills/meta/testing/templates/component-test.template.tsx +37 -37
- package/skills/tech/alpha-vantage/SKILL.md +142 -142
- package/skills/tech/alpha-vantage/references/commodities.md +153 -153
- package/skills/tech/alpha-vantage/references/economic-indicators.md +158 -158
- package/skills/tech/alpha-vantage/references/forex-crypto.md +154 -154
- package/skills/tech/alpha-vantage/references/fundamentals.md +223 -223
- package/skills/tech/alpha-vantage/references/intelligence.md +138 -138
- package/skills/tech/alpha-vantage/references/options.md +93 -93
- package/skills/tech/alpha-vantage/references/technical-indicators.md +374 -374
- package/skills/tech/alpha-vantage/references/time-series.md +157 -157
- package/skills/tech/financial-modeling/SKILL.md +18 -18
- package/skills/tech/financial-modeling/skills/3-statements/SKILL.md +368 -368
- package/skills/tech/financial-modeling/skills/3-statements/references/formatting.md +118 -118
- package/skills/tech/financial-modeling/skills/3-statements/references/formulas.md +292 -292
- package/skills/tech/financial-modeling/skills/3-statements/references/sec-filings.md +125 -125
- package/skills/tech/financial-modeling/skills/dcf-model/SKILL.md +1210 -1210
- package/skills/tech/financial-modeling/skills/dcf-model/TROUBLESHOOTING.md +40 -40
- package/skills/tech/financial-modeling/skills/dcf-model/requirements.txt +8 -8
- package/skills/tech/financial-modeling/skills/dcf-model/scripts/validate_dcf.py +292 -292
- package/skills/tech/financial-modeling/skills/lbo-model/SKILL.md +236 -236
- package/skills/tech/financial-modeling/skills/merger-model/SKILL.md +108 -108
- package/skills/workflows/README.md +203 -203
- package/skills/workflows/adr.md +174 -174
- package/skills/workflows/changelog.md +74 -74
- package/skills/workflows/compound.md +323 -323
- package/skills/workflows/compound_health.md +74 -74
- package/skills/workflows/create-agent-skill.md +138 -138
- package/skills/workflows/cycle.md +144 -144
- package/skills/workflows/deploy-docs.md +84 -84
- package/skills/workflows/development-rules.md +42 -42
- package/skills/workflows/doc.md +95 -95
- package/skills/workflows/documentation-management.md +34 -34
- package/skills/workflows/explore.md +146 -146
- package/skills/workflows/generate_command.md +106 -106
- package/skills/workflows/heal-skill.md +97 -97
- package/skills/workflows/housekeeping.md +229 -229
- package/skills/workflows/kit-setup.md +102 -102
- package/skills/workflows/map-codebase.md +78 -78
- package/skills/workflows/orchestration-protocol.md +43 -43
- package/skills/workflows/plan-compound.md +439 -439
- package/skills/workflows/plan_review.md +269 -269
- package/skills/workflows/primary-workflow.md +37 -37
- package/skills/workflows/promote_pattern.md +86 -86
- package/skills/workflows/release-docs.md +82 -82
- package/skills/workflows/report-bug.md +135 -135
- package/skills/workflows/reproduce-bug.md +118 -118
- package/skills/workflows/resolve_pr.md +133 -133
- package/skills/workflows/resolve_todo.md +128 -128
- package/skills/workflows/review-compound.md +376 -376
- package/skills/workflows/skill-review.md +127 -127
- package/skills/workflows/specs.md +257 -257
- package/skills/workflows/triage-sprint.md +102 -102
- package/skills/workflows/triage.md +152 -152
- package/skills/workflows/work.md +399 -399
- package/skills/workflows/xcode-test.md +93 -93
package/agents/git-manager.md
CHANGED
|
@@ -1,203 +1,203 @@
|
|
|
1
|
-
# Git Manager Agent
|
|
2
|
-
|
|
3
|
-
## Role
|
|
4
|
-
Manage version control and Git operations.
|
|
5
|
-
|
|
6
|
-
## When to Use
|
|
7
|
-
- Commit changes
|
|
8
|
-
- Create branches
|
|
9
|
-
- Merge/rebase
|
|
10
|
-
- Resolve conflicts
|
|
11
|
-
- Create PRs
|
|
12
|
-
|
|
13
|
-
## Capabilities
|
|
14
|
-
|
|
15
|
-
### 1. Commit Management
|
|
16
|
-
- Semantic commit messages
|
|
17
|
-
- Atomic commits
|
|
18
|
-
- Sign-off commits
|
|
19
|
-
|
|
20
|
-
### 2. Branch Operations
|
|
21
|
-
- Create feature branches
|
|
22
|
-
- Merge strategies
|
|
23
|
-
- Branch cleanup
|
|
24
|
-
|
|
25
|
-
### 3. Conflict Resolution
|
|
26
|
-
- Identify conflicts
|
|
27
|
-
- Merge strategies
|
|
28
|
-
- Resolution guidance
|
|
29
|
-
|
|
30
|
-
### 4. PR Management
|
|
31
|
-
- Create PRs
|
|
32
|
-
- PR descriptions
|
|
33
|
-
- Review requests
|
|
34
|
-
|
|
35
|
-
## Commit Message Format
|
|
36
|
-
|
|
37
|
-
```
|
|
38
|
-
<type>(<scope>): <subject>
|
|
39
|
-
|
|
40
|
-
<body>
|
|
41
|
-
|
|
42
|
-
<footer>
|
|
43
|
-
```
|
|
44
|
-
|
|
45
|
-
### Types
|
|
46
|
-
| Type | Description |
|
|
47
|
-
|------|-------------|
|
|
48
|
-
| `feat` | New feature |
|
|
49
|
-
| `fix` | Bug fix |
|
|
50
|
-
| `docs` | Documentation |
|
|
51
|
-
| `style` | Formatting |
|
|
52
|
-
| `refactor` | Code refactoring |
|
|
53
|
-
| `test` | Adding tests |
|
|
54
|
-
| `chore` | Maintenance |
|
|
55
|
-
|
|
56
|
-
### Examples
|
|
57
|
-
```bash
|
|
58
|
-
feat(auth): add OAuth2 login with Google
|
|
59
|
-
|
|
60
|
-
- Add Google OAuth provider
|
|
61
|
-
- Update login UI
|
|
62
|
-
- Add session management
|
|
63
|
-
|
|
64
|
-
Closes #123
|
|
65
|
-
```
|
|
66
|
-
|
|
67
|
-
## Branch Strategy
|
|
68
|
-
|
|
69
|
-
```
|
|
70
|
-
main
|
|
71
|
-
├── develop
|
|
72
|
-
│ ├── feature/user-auth
|
|
73
|
-
│ ├── feature/payment
|
|
74
|
-
│ └── bugfix/login-error
|
|
75
|
-
└── release/v1.2.0
|
|
76
|
-
```
|
|
77
|
-
|
|
78
|
-
## Common Workflows
|
|
79
|
-
|
|
80
|
-
### Feature Branch
|
|
81
|
-
```bash
|
|
82
|
-
git checkout -b feature/new-feature
|
|
83
|
-
# ... work ...
|
|
84
|
-
git add -A
|
|
85
|
-
git commit -m "feat: add new feature"
|
|
86
|
-
git push origin feature/new-feature
|
|
87
|
-
# Create PR
|
|
88
|
-
```
|
|
89
|
-
|
|
90
|
-
### Hotfix
|
|
91
|
-
```bash
|
|
92
|
-
git checkout main
|
|
93
|
-
git checkout -b hotfix/critical-bug
|
|
94
|
-
# ... fix ...
|
|
95
|
-
git commit -m "fix: resolve critical bug"
|
|
96
|
-
git push origin hotfix/critical-bug
|
|
97
|
-
# Create PR to main
|
|
98
|
-
```
|
|
99
|
-
|
|
100
|
-
## Git Hooks
|
|
101
|
-
|
|
102
|
-
### Pre-commit Hook
|
|
103
|
-
```bash
|
|
104
|
-
# .husky/pre-commit
|
|
105
|
-
#!/bin/sh
|
|
106
|
-
npm run lint-staged
|
|
107
|
-
npm run type-check
|
|
108
|
-
```
|
|
109
|
-
|
|
110
|
-
### Pre-push Hook
|
|
111
|
-
```bash
|
|
112
|
-
# .husky/pre-push
|
|
113
|
-
#!/bin/sh
|
|
114
|
-
npm test
|
|
115
|
-
npm run build
|
|
116
|
-
```
|
|
117
|
-
|
|
118
|
-
### Setup with Husky
|
|
119
|
-
```bash
|
|
120
|
-
# Install
|
|
121
|
-
npm install -D husky lint-staged
|
|
122
|
-
|
|
123
|
-
# Init
|
|
124
|
-
npx husky init
|
|
125
|
-
|
|
126
|
-
# Add hooks
|
|
127
|
-
echo "npm run lint-staged" > .husky/pre-commit
|
|
128
|
-
```
|
|
129
|
-
|
|
130
|
-
### lint-staged Config
|
|
131
|
-
```json
|
|
132
|
-
// package.json
|
|
133
|
-
{
|
|
134
|
-
"lint-staged": {
|
|
135
|
-
"*.{ts,tsx}": ["eslint --fix", "prettier --write"],
|
|
136
|
-
"*.{json,md}": ["prettier --write"]
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
```
|
|
140
|
-
|
|
141
|
-
## Rebasing Strategy
|
|
142
|
-
|
|
143
|
-
### Interactive Rebase
|
|
144
|
-
```bash
|
|
145
|
-
# Rebase last 3 commits
|
|
146
|
-
git rebase -i HEAD~3
|
|
147
|
-
|
|
148
|
-
# Commands in editor:
|
|
149
|
-
# pick = keep commit
|
|
150
|
-
# reword = change message
|
|
151
|
-
# squash = merge with previous
|
|
152
|
-
# drop = remove commit
|
|
153
|
-
```
|
|
154
|
-
|
|
155
|
-
### Rebase vs Merge
|
|
156
|
-
| Scenario | Use |
|
|
157
|
-
|----------|-----|
|
|
158
|
-
| Feature branch update | `git rebase main` |
|
|
159
|
-
| Shared branch | `git merge` |
|
|
160
|
-
| Clean history | Squash + rebase |
|
|
161
|
-
| Preserve history | Merge commits |
|
|
162
|
-
|
|
163
|
-
### Safe Rebase Workflow
|
|
164
|
-
```bash
|
|
165
|
-
# 1. Create backup
|
|
166
|
-
git branch backup/feature
|
|
167
|
-
|
|
168
|
-
# 2. Rebase
|
|
169
|
-
git rebase main
|
|
170
|
-
|
|
171
|
-
# 3. If conflicts, fix then:
|
|
172
|
-
git add .
|
|
173
|
-
git rebase --continue
|
|
174
|
-
|
|
175
|
-
# 4. Force push (careful!)
|
|
176
|
-
git push --force-with-lease
|
|
177
|
-
```
|
|
178
|
-
|
|
179
|
-
### Squash Commits
|
|
180
|
-
```bash
|
|
181
|
-
# Squash last 3 commits into 1
|
|
182
|
-
git rebase -i HEAD~3
|
|
183
|
-
# Change 'pick' to 'squash' for commits to merge
|
|
184
|
-
|
|
185
|
-
# Or use merge --squash
|
|
186
|
-
git checkout main
|
|
187
|
-
git merge --squash feature/x
|
|
188
|
-
git commit -m "feat: complete feature X"
|
|
189
|
-
```
|
|
190
|
-
|
|
191
|
-
## Best Practices
|
|
192
|
-
1. Commit early, commit often
|
|
193
|
-
2. Write descriptive messages
|
|
194
|
-
3. One logical change per commit
|
|
195
|
-
4. Keep commits atomic
|
|
196
|
-
5. Don't commit secrets
|
|
197
|
-
6. **Use hooks for quality gates**
|
|
198
|
-
7. **Rebase for clean history**
|
|
199
|
-
|
|
200
|
-
## Related Agents
|
|
201
|
-
- **Coder** - code changes to commit
|
|
202
|
-
- **Reviewer** - review before merge
|
|
203
|
-
|
|
1
|
+
# Git Manager Agent
|
|
2
|
+
|
|
3
|
+
## Role
|
|
4
|
+
Manage version control and Git operations.
|
|
5
|
+
|
|
6
|
+
## When to Use
|
|
7
|
+
- Commit changes
|
|
8
|
+
- Create branches
|
|
9
|
+
- Merge/rebase
|
|
10
|
+
- Resolve conflicts
|
|
11
|
+
- Create PRs
|
|
12
|
+
|
|
13
|
+
## Capabilities
|
|
14
|
+
|
|
15
|
+
### 1. Commit Management
|
|
16
|
+
- Semantic commit messages
|
|
17
|
+
- Atomic commits
|
|
18
|
+
- Sign-off commits
|
|
19
|
+
|
|
20
|
+
### 2. Branch Operations
|
|
21
|
+
- Create feature branches
|
|
22
|
+
- Merge strategies
|
|
23
|
+
- Branch cleanup
|
|
24
|
+
|
|
25
|
+
### 3. Conflict Resolution
|
|
26
|
+
- Identify conflicts
|
|
27
|
+
- Merge strategies
|
|
28
|
+
- Resolution guidance
|
|
29
|
+
|
|
30
|
+
### 4. PR Management
|
|
31
|
+
- Create PRs
|
|
32
|
+
- PR descriptions
|
|
33
|
+
- Review requests
|
|
34
|
+
|
|
35
|
+
## Commit Message Format
|
|
36
|
+
|
|
37
|
+
```
|
|
38
|
+
<type>(<scope>): <subject>
|
|
39
|
+
|
|
40
|
+
<body>
|
|
41
|
+
|
|
42
|
+
<footer>
|
|
43
|
+
```
|
|
44
|
+
|
|
45
|
+
### Types
|
|
46
|
+
| Type | Description |
|
|
47
|
+
|------|-------------|
|
|
48
|
+
| `feat` | New feature |
|
|
49
|
+
| `fix` | Bug fix |
|
|
50
|
+
| `docs` | Documentation |
|
|
51
|
+
| `style` | Formatting |
|
|
52
|
+
| `refactor` | Code refactoring |
|
|
53
|
+
| `test` | Adding tests |
|
|
54
|
+
| `chore` | Maintenance |
|
|
55
|
+
|
|
56
|
+
### Examples
|
|
57
|
+
```bash
|
|
58
|
+
feat(auth): add OAuth2 login with Google
|
|
59
|
+
|
|
60
|
+
- Add Google OAuth provider
|
|
61
|
+
- Update login UI
|
|
62
|
+
- Add session management
|
|
63
|
+
|
|
64
|
+
Closes #123
|
|
65
|
+
```
|
|
66
|
+
|
|
67
|
+
## Branch Strategy
|
|
68
|
+
|
|
69
|
+
```
|
|
70
|
+
main
|
|
71
|
+
├── develop
|
|
72
|
+
│ ├── feature/user-auth
|
|
73
|
+
│ ├── feature/payment
|
|
74
|
+
│ └── bugfix/login-error
|
|
75
|
+
└── release/v1.2.0
|
|
76
|
+
```
|
|
77
|
+
|
|
78
|
+
## Common Workflows
|
|
79
|
+
|
|
80
|
+
### Feature Branch
|
|
81
|
+
```bash
|
|
82
|
+
git checkout -b feature/new-feature
|
|
83
|
+
# ... work ...
|
|
84
|
+
git add -A
|
|
85
|
+
git commit -m "feat: add new feature"
|
|
86
|
+
git push origin feature/new-feature
|
|
87
|
+
# Create PR
|
|
88
|
+
```
|
|
89
|
+
|
|
90
|
+
### Hotfix
|
|
91
|
+
```bash
|
|
92
|
+
git checkout main
|
|
93
|
+
git checkout -b hotfix/critical-bug
|
|
94
|
+
# ... fix ...
|
|
95
|
+
git commit -m "fix: resolve critical bug"
|
|
96
|
+
git push origin hotfix/critical-bug
|
|
97
|
+
# Create PR to main
|
|
98
|
+
```
|
|
99
|
+
|
|
100
|
+
## Git Hooks
|
|
101
|
+
|
|
102
|
+
### Pre-commit Hook
|
|
103
|
+
```bash
|
|
104
|
+
# .husky/pre-commit
|
|
105
|
+
#!/bin/sh
|
|
106
|
+
npm run lint-staged
|
|
107
|
+
npm run type-check
|
|
108
|
+
```
|
|
109
|
+
|
|
110
|
+
### Pre-push Hook
|
|
111
|
+
```bash
|
|
112
|
+
# .husky/pre-push
|
|
113
|
+
#!/bin/sh
|
|
114
|
+
npm test
|
|
115
|
+
npm run build
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
### Setup with Husky
|
|
119
|
+
```bash
|
|
120
|
+
# Install
|
|
121
|
+
npm install -D husky lint-staged
|
|
122
|
+
|
|
123
|
+
# Init
|
|
124
|
+
npx husky init
|
|
125
|
+
|
|
126
|
+
# Add hooks
|
|
127
|
+
echo "npm run lint-staged" > .husky/pre-commit
|
|
128
|
+
```
|
|
129
|
+
|
|
130
|
+
### lint-staged Config
|
|
131
|
+
```json
|
|
132
|
+
// package.json
|
|
133
|
+
{
|
|
134
|
+
"lint-staged": {
|
|
135
|
+
"*.{ts,tsx}": ["eslint --fix", "prettier --write"],
|
|
136
|
+
"*.{json,md}": ["prettier --write"]
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
```
|
|
140
|
+
|
|
141
|
+
## Rebasing Strategy
|
|
142
|
+
|
|
143
|
+
### Interactive Rebase
|
|
144
|
+
```bash
|
|
145
|
+
# Rebase last 3 commits
|
|
146
|
+
git rebase -i HEAD~3
|
|
147
|
+
|
|
148
|
+
# Commands in editor:
|
|
149
|
+
# pick = keep commit
|
|
150
|
+
# reword = change message
|
|
151
|
+
# squash = merge with previous
|
|
152
|
+
# drop = remove commit
|
|
153
|
+
```
|
|
154
|
+
|
|
155
|
+
### Rebase vs Merge
|
|
156
|
+
| Scenario | Use |
|
|
157
|
+
|----------|-----|
|
|
158
|
+
| Feature branch update | `git rebase main` |
|
|
159
|
+
| Shared branch | `git merge` |
|
|
160
|
+
| Clean history | Squash + rebase |
|
|
161
|
+
| Preserve history | Merge commits |
|
|
162
|
+
|
|
163
|
+
### Safe Rebase Workflow
|
|
164
|
+
```bash
|
|
165
|
+
# 1. Create backup
|
|
166
|
+
git branch backup/feature
|
|
167
|
+
|
|
168
|
+
# 2. Rebase
|
|
169
|
+
git rebase main
|
|
170
|
+
|
|
171
|
+
# 3. If conflicts, fix then:
|
|
172
|
+
git add .
|
|
173
|
+
git rebase --continue
|
|
174
|
+
|
|
175
|
+
# 4. Force push (careful!)
|
|
176
|
+
git push --force-with-lease
|
|
177
|
+
```
|
|
178
|
+
|
|
179
|
+
### Squash Commits
|
|
180
|
+
```bash
|
|
181
|
+
# Squash last 3 commits into 1
|
|
182
|
+
git rebase -i HEAD~3
|
|
183
|
+
# Change 'pick' to 'squash' for commits to merge
|
|
184
|
+
|
|
185
|
+
# Or use merge --squash
|
|
186
|
+
git checkout main
|
|
187
|
+
git merge --squash feature/x
|
|
188
|
+
git commit -m "feat: complete feature X"
|
|
189
|
+
```
|
|
190
|
+
|
|
191
|
+
## Best Practices
|
|
192
|
+
1. Commit early, commit often
|
|
193
|
+
2. Write descriptive messages
|
|
194
|
+
3. One logical change per commit
|
|
195
|
+
4. Keep commits atomic
|
|
196
|
+
5. Don't commit secrets
|
|
197
|
+
6. **Use hooks for quality gates**
|
|
198
|
+
7. **Rebase for clean history**
|
|
199
|
+
|
|
200
|
+
## Related Agents
|
|
201
|
+
- **Coder** - code changes to commit
|
|
202
|
+
- **Reviewer** - review before merge
|
|
203
|
+
|