fix-merge-conflicts

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

Get it

$ npx degit cashew-labs/libretto/.agents/skills/fix-merge-conflicts .claude/skills/fix-merge-conflicts

From the most-starred rig that ships it: cashew-labs/libretto. Same-named skills in different rigs may differ — review before use.

Often used together with

Rigs using fix-merge-conflicts (7)

cashew-labs/libretto

The AI toolkit for building reliable browser automations

★ 904 project Claude CodeCodex 24 skills 2mo ago

Skill Collector 2.9k tok ·

michael-denyer/pstack-claude

Claude Code, Codex, Pi, OpenCode, Gemini, and Prime Agent versions of Poteto's pstack. Rigorous agent workflows with Cursor primitives translated for other harnesses.

★ 775 collection Claude Code 58 skills 6d ago

Skill Collector 3.7k tok ·

Asymmetric-al/core

A high-performance, enterprise-grade Next.js 16 application for mission-focused non-profit organizations. Built for high impact teams.

★ 381 project Claude CodeCodexCursor 4 mcp 150 skills 4 agents 1d ago

Skill Collector 19.6k tok ·

fmflurry/settings-opencode

Custom OpenCode settings

★ 171 setup Claude CodeCodex 1 mcp 71 skills 26 agents 7 hooks 2d ago

YOLO Cowboy 17.8k tok ·

shipshitdev/skills

Claude, Cursor, Codex skills and commands

★ 38 collection Claude CodeCodex 133 skills today

Skill Collector 10.4k tok ·

ulises-jeremias/agent-toolkit

🛠️ Composable AI agent toolkit — skills, agents, loops, and MCP templates for Claude Code, Cursor, OpenCode, Copilot, Windsurf, and Pi

★ 18 project Claude CodeCodexCopilot 3 mcp 105 skills 24 agents 4d ago

Orchestrator 21.8k tok ·

arjitj2/open-pstack

Pstack for Codex and Claude Code, with cross-provider routing and automatic failover. Devin, Cursor, Antigravity, OpenCode, and Grok subagents available. All using your own subscriptions.

★ 6 collection Codex 59 skills 3d ago

Skill Collector 5.8k tok ·