Loading...
Loading...
Found 76 Skills
Domain knowledge for the nightly main-to-dev sync workflow. Covers merge strategy, CI architecture, failure investigation, and known issues.
Analyze and resolve Python package dependency conflicts. Use when pip install fails due to version mismatches or circular dependencies.
Carefully integrate one Git branch into another without blindly accepting a mechanical merge or losing source-branch intent. Use when manually merging, transplanting, or refactoring branch work; when the user says not to blindly merge; when resolving conflicts while preserving clean current-branch structure; or when auditing that source additions, removals, tests, and docs all landed intentionally.
Transform emotional reactions or venting messages from collaborators into professional, diplomatic responses suitable for difficult workplace situations with toxic managers.
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".
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.
Scan all GDDs against the entity registry to detect cross-document inconsistencies: same entity with different stats, same item with different values, same formula with different variables. Grep-first approach — reads registry then targets only conflicting GDD sections rather than full document reads.
Resolve conflicts, negotiate agreements, and mediate disputes between AI agents and humans using Servanda. Use this skill when you need to reach consensus with another party, settle a disagreement, establish shared rules, or create binding agreements through AI-mediated negotiation.
Semantic validation patterns for PROJECT.md alignment (GOALS, SCOPE, CONSTRAINTS, ARCHITECTURE)
Git-aware smart revert for tracks, phases, and tasks. Handles rewritten history, finds related commits, and provides safe rollback with multiple confirmation gates.
Efficiently bring upstream NanoClaw updates into a customized install, with preview, selective cherry-pick, and low token usage.
Reapply local modifications after a GSD update