resolve-conflicts

github:antinomyhq/forge · first committed 2025-11-25 · source · badge

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.

Skill Health: not yet scored

Listed, not yet scored. This skill has no public model test yet. It is in the scoring queue; submitted skills go first, then the most-installed.

Version history

4 commits to this file on GitHub (newest first).

2025-11-27 · commit ee24908 · docs(skills): add plan-first workflow to conflict resolver (#1998)
2025-11-25 · commit e8dfb5f · docs(skills): expand generated file guidance in conflict resolver (#1975)
2025-11-25 · commit ede5a82 · chore: Update `resolve-conflict` skill (#1969)
2025-11-25 · commit 74b4be0 · feat(skills): add git conflict resolution skill with automated handling (#1967)

Archived snapshots