Loading...
Loading...
Found 75 Skills
Git branching strategies, conflict resolution, rebase workflows, monorepo patterns, and advanced operations like cherry-pick, bisect, and reflog recovery. Activate on "git", "branching strategy", "merge conflict", "rebase", "cherry-pick", "monorepo git", "git bisect", "git reflog", "squash commits". NOT for GitHub Actions CI/CD (use github-actions-pipeline-builder), GitHub API/webhooks, or PR review processes (use code-review-checklist).
Advanced git workflows with branch management, conflict resolution, and PR lifecycle
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.
Analyze and resolve Python package dependency conflicts. Use when pip install fails due to version mismatches or circular dependencies.
Help users navigate tough feedback, performance conversations, and conflict. Use when someone needs to give hard feedback, have a performance conversation, fire someone, address conflict with a colleague, or deliver disappointing news like a denied promotion.
Use when implementing 'CloudKit sync', 'CKSyncEngine', 'CKRecord', 'CKDatabase', 'SwiftData CloudKit', 'shared database', 'public database', 'CloudKit zones', 'conflict resolution' - comprehensive CloudKit database APIs and modern sync patterns reference
Yjs CRDT patterns, shared types, conflict resolution, and meta data structures. Use when building collaborative apps with Yjs, handling Y.Map/Y.Array/Y.Text, implementing drag-and-drop reordering, or optimizing document storage.
Transform emotional reactions or venting messages from collaborators into professional, diplomatic responses suitable for difficult workplace situations with toxic managers.
Jujutsu (`jj`) is a Git-compatible version control system with a simpler mental model - no staging area, working copy is always a commit, and conflicts don't block operations. Use this skill for version control operations in `jj` repositories (which may be co-located with `git`) or when `jj` is called out specifically.
Semantic validation patterns for PROJECT.md alignment (GOALS, SCOPE, CONSTRAINTS, ARCHITECTURE)
Git best practices including commit message conventions, interactive rebase, conflict resolution, and repository hygiene. Reference for all git operations.
Communication coaching for working with an Sc (The Planner) DISC type — methodical, careful, dependable. Covers do's, don'ts, meetings, email, feedback, and conflict. Powered by Crystal's DISC framework.