Loading...
Loading...
Found 97 Skills
Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.
Advanced git workflows with branch management, conflict resolution, and PR lifecycle
Synchronize work between Antigravity and Claude Code agents
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.
Complete Git expertise system for ALL git operations. PROACTIVELY activate for: (1) ANY Git task (basic/advanced/dangerous), (2) Repository management, (3) Branch strategies and workflows, (4) Conflict resolution, (5) History rewriting/recovery, (6) Platform-specific operations (GitHub/Azure DevOps/Bitbucket), (7) Advanced commands (rebase/cherry-pick/filter-repo). Provides: complete Git command reference, safety guardrails for destructive operations, platform best practices, workflow strategies, reflog recovery techniques, and expert guidance for even the most risky operations. Always asks user preference for automatic commits vs manual control.
Combines and synthesizes outputs from parallel DAG branches. Handles merge strategies, conflict resolution, and result formatting. Activate on 'aggregate results', 'combine outputs', 'merge branches', 'synthesize results', 'fan-in'. NOT for execution (use dag-parallel-executor) or scheduling (use dag-task-scheduler).
Semantic validation patterns for PROJECT.md alignment (GOALS, SCOPE, CONSTRAINTS, ARCHITECTURE)
Byzantine consensus voting for multi-agent decision making. Implements voting protocols, conflict resolution, and agreement algorithms for reaching consensus among multiple agents.
Git-aware smart revert for tracks, phases, and tasks. Handles rewritten history, finds related commits, and provides safe rollback with multiple confirmation gates.
[Git] Resolve git merge/cherry-pick/rebase conflicts with backup, analysis, and reporting
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.
Initialize GitHub repository configuration. Use when setting up new projects or CI/CD workflows.