Loading...
Loading...
Found 97 Skills
Shared foundation for Oracle & Corrector agents. Establishes the source hierarchy for resolving conflicts between documentation, code, and specs. Load this skill first when investigating how the system works.
Generate Django database migrations for Sentry. Use when creating migrations, adding/removing columns or tables, adding indexes, or resolving migration conflicts.
Manages Gradle dependencies using version catalogs, BOMs, and dependency constraints. Use when setting up dependency management, centralizing versions, resolving conflicts, or configuring multi-module dependency sharing. Triggers on "setup version catalog", "centralize dependencies", "resolve version conflict", or "configure Gradle BOM". Works with gradle/libs.versions.toml and includes Bill of Materials, dependency constraints, and Spring Boot/GCP BOM integration.
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Unblock a PR: resolve conflicts, fix CI, address reviews. Composes: git-mastery conflict resolution, /fix-ci, /respond, /address-review. Use when: PR is blocked by conflicts, red CI, or unaddressed review feedback.
Resolve merge conflicts systematically with context-aware 3-tier classification and escalation protocol
Git troubleshooting techniques including recovering lost commits, fixing merge conflicts, resolving detached HEAD, and diagnosing repository issues. Use when user encounters git errors or needs to recover from mistakes.
Use when managing branches and PRs with the Graphite CLI (gt). Covers creating stacked PRs, modifying mid-stack, submitting, syncing, and resolving conflicts.
Automate repetitive code tasks using the build_runner system.
Worktree-native merge engineer — git worktree lifecycle, isolated merges and conflict resolution, worktree path conventions, parallel worktree operations, and cleanup automation. Invoke via /git-merge-expert-worktree or when user says "merge in worktree", "isolated merge", "worktree merge".
Local-first architecture decision framework for web applications. Covers when to go local-first vs server-based vs hybrid, sync engine selection (ElectricSQL, Zero, PowerSync, Replicache, LiveStore, Triplit), client-side storage options (IndexedDB, OPFS, SQLite WASM, PGlite), and conflict resolution strategies (LWW, CRDTs, server-wins, field-level merge). Use when deciding whether to adopt local-first architecture, choosing a sync engine, selecting client storage, or designing conflict resolution strategies.
Merge the latest default branch (e.g. origin/main) into the current branch, resolve merge conflicts, and verify with pnpm lint && pnpm test. Merge-based sync (not rebase) unless the repo specifies otherwise. Use when syncing a feature branch with origin, after a non-fast-forward push, or when the branch is behind. Does not push or manage PRs—use push and create-pr-jp for those.