resolve-conflicts
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
Third-Party Agent Skill: Review the code before installing. Agent skills execute in your AI assistant's environment and can access your files. Learn more about security
Installation for Agentic Skill
View all platforms →skilz install antinomyhq/forge/resolve-conflictsskilz install antinomyhq/forge/resolve-conflicts --agent opencodeskilz install antinomyhq/forge/resolve-conflicts --agent codexskilz install antinomyhq/forge/resolve-conflicts --agent geminiFirst time? Install Skilz: pip install skilz
Works with 22+ AI coding assistants
Cursor, Aider, Copilot, Windsurf, Qwen, Kimi, and more...
Extract and copy to ~/.claude/skills/ then restart Claude Desktop
git clone https://github.com/antinomyhq/forgecp -r forge/.forge/skills/resolve-conflicts ~/.claude/skills/Need detailed installation help? Check our platform-specific guides:
Related Agentic Skills
command-name
by anthropics
This skill should be used when the user asks to "create a plugin", "scaffold a plugin", "understand plugin structure", "organize plugin components"...
mcp-integration
by anthropics
This skill should be used when the user asks to "add MCP server", "integrate MCP", "configure MCP in plugin", "use .mcp.json", "set up Model Contex...
rule-identifier
by anthropics
This skill should be used when the user asks to "create a hookify rule", "write a hook rule", "configure hookify", "add a hookify rule", or needs g...
bloblang-authoring
by redpanda-data
This skill should be used when users need to create or debug Bloblang transformation scripts. Trigger when users ask about transforming data, mappi...
Agentic Skill Details
- Owner
- antinomyhq (GitHub)
- Repository
- forge
- Stars
- 4583
- Forks
- 1177
- Type
- Technical
- Meta-Domain
- productivity
- Primary Domain
- json
- Market Score
- 52
Browse Category
More productivity Agentic SkillsReport Security Issue
Found a security vulnerability in this agent skill?
Report Security Issue
Thank you for helping keep SkillzWave secure. We'll review your report and take appropriate action.
Note: For critical security issues that require immediate attention, please also email security@skillzwave.ai directly.