adds skill for handling upstream changes and merging to local
Some checks failed
CI / test (push) Has been cancelled

This commit is contained in:
John Lamb
2026-02-17 10:48:20 -06:00
parent 85f97affb5
commit e092c9e5ad
7 changed files with 272 additions and 632 deletions

View File

@@ -8,7 +8,7 @@ AI-powered development tools that get smarter with every use. Make each unit of
|-----------|-------|
| Agents | 25 |
| Commands | 23 |
| Skills | 18 |
| Skills | 19 |
| MCP Servers | 1 |
## Agents
@@ -127,6 +127,7 @@ Core workflow commands use `workflows:` prefix to avoid collisions with built-in
| `git-worktree` | Manage Git worktrees for parallel development |
| `resolve-pr-parallel` | Resolve PR review comments in parallel |
| `setup` | Configure which review agents run for your project |
| `upstream-merge` | Incorporate upstream git changes while preserving local fork intent |
### Multi-Agent Orchestration