Resolve Conflicts
When you hit merge conflicts, this skill stops you from manually editing conflict markers and instead walks you through a structured resolution process. It categorizes your conflicts (imports, tests, generated files, deleted files), creates a detailed resolution plan for approval, then executes it with explanations for each decision. The approach is opinionated: prefer keeping both changes over choosing sides, always regenerate lock files instead of merging them, and back up deleted files before resolving. It's thorough to the point of being verbose, which is either exactly what you want when dealing with a hairy merge or overkill for a simple two-line conflict. Worth it if you're merging long-lived branches where guessing wrong is expensive.
- installs
- 643
- GitHub stars
- 7.5K
- last updated
- Jul 14, 2026
Install
$ npx -y skills add antinomyhq/forge --skill resolve-conflicts --agent claude-codeInstalls into .claude/skills of the current project.
Files
Git Conflict Resolution
Resolve Git merge conflicts by intelligently combining changes from both branches while preserving the intent of both changes. This skill follows a plan-first approach: assess conflicts, create a detailed resolution plan, get approval, then execute.
Core Principles
- Plan Before Executing: Always create a structured resolution plan and get user approval before making changes
- Prefer Both Changes: Default to keeping both changes unless they directly contradict
- Merge, Don't Choose: Especially for imports, tests, and configuration
- Regenerate Generated Files: Never manually merge generated files - always regenerate them from their sources
- Backup Before Resolving: For deleted-modified files, create backups first
- Validate with Tests: Always run tests after resolution
- Explain All Resolutions: For each conflict resolved, provide a one-line explanation of the resolution strategy
- Ask When Unclear: When the correct resolution isn't clear from the diff, present options to the user and ask for their choice
Workflow
Step 1: Assess the Conflict Situation
Sponsors
Details
- Repository
- github.com/antinomyhq/forge
- First seen
- Jun 3, 2026
