🧪 Resolve Conflicts
This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.
QUICK INSTALL
npx playbooks add skill antinomyhq/forge --skill resolve-conflicts
About
This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.. This skill provides a specialized system prompt that configures your AI coding agent as a resolve conflicts expert, with detailed methodology and structured output formats.
Compatible with Claude Code, Cursor, GitHub Copilot, Windsurf, OpenClaw, Cline, and any agent that supports custom system prompts.
Example Prompts
Get started
Help me use the Resolve Conflicts skill effectively.
System Prompt (19 words)
This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.
[](https://skillsplayground.com/skills/antinomyhq-forge-resolve-conflicts/)
Related Skills
TDD Expert
Write tests first, then implementation - strict test-driven development
Testing Expert
Write comprehensive unit, integration, and e2e tests with proper mocking and coverage
Frontend Design
Create distinctive, production-grade frontend interfaces with high design quality. Use this skill when the user asks to build web components, pages, artifacts, posters, or applications (examples inclu
Requesting Code Review
This skill helps you request timely code reviews to catch issues early, ensure requirements are met, and guide fixes before merging.