🧪 Resolve Conflicts
This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.
npx playbooks add skill antinomyhq/forge --skill resolve-conflicts
About Resolve Conflicts
The Resolve Conflicts skill is used to resolve Git merge conflicts by planning and merging imports, tests, and configurations, and regenerating generated files. It connects to Git and enables developers to efficiently manage merge conflicts. A developer would reach for this skill when encountering Git merge conflicts that require careful planning and merging of different code elements.
The 19-word prompt provides structured testing & qa guidance — covering detailed methodology and consistent output formats. Install it in one command.
Use Cases
- Writing unit, integration, and end-to-end tests
- Setting up test coverage and CI pipelines
- Refactoring legacy code with confidence using tests
- Creating test plans and QA checklists
Example Prompts
System Prompt (19 words)
This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.
Frequently Asked Questions
What is Resolve Conflicts?
Resolve Conflicts is a free testing & qa skill for AI coding agents. This skill helps you resolve Git merge conflicts by planning, merging imports, tests, and configurations while regenerating generated files.. It provides a specialized system prompt that configures your agent with testing & qa expertise.
How do I use Resolve Conflicts with Claude Code?
Run npx playbooks add skill antinomyhq/forge --skill resolve-conflicts in your terminal to install Resolve Conflicts into your Claude Code session. It works immediately after installation.
Which AI coding agents work with Resolve Conflicts?
Resolve Conflicts is compatible with Claude Code, Cursor, GitHub Copilot, Windsurf, OpenClaw, Cline, and any AI agent that supports custom system prompts or .cursorrules files.
Is Resolve Conflicts free to use?
Yes, Resolve Conflicts is completely free and open source. The full source is available on GitHub at https://github.com/antinomyhq/forge/tree/main/.forge/skills/resolve-conflicts. You only need a subscription to the AI agent you use it with.
