Home / Skills / resolve-conflicts
resolve-conflicts
tailcallhq/forgecodeSkill
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.
Why this score
This repo hosts 10 skills, so its 7,635 stars are split between them (about 764 each) for scoring.
Popularity score: 79/100 from public GitHub signals only. It shows how widely used and maintained this is, not how well it works. Not included yet: the fake-star check. The security scan is shown separately and doesn't change the score. How we rank
Security
Scanned Oct 20, 2026 at commit e261e7c5b8f1, with Cisco's open-source skill-scanner.
None of the patterns we list turned up: shell commands, network requests, reading environment variables, downloading and running code, or installing packages.
A scan lists patterns in the code. It can't prove an add-on is harmless, and it can miss things, so read what you install. How we scan
Alternatives
Other makers' add-ons that do the same job, next to this one.
| Name | Score | Stars | Context | Updated |
|---|---|---|---|---|
| This oneresolve-conflicts tailcallhq/forgecode · Skill | 79 | ★ 7.6k | ≈96 always | 16d ago |
| agent-merge-conflict-arbiter NousResearch/hermes-agent · Skill Both about conflict and merge | 96 | ★ 255k | ≈21 always | 16d ago |
| dart-resolve-package-conflicts flutter/agent-plugins · Skill Both about conflict and resolve | 72 | ★ 3.1k | ≈36 always | 16d ago |
| resolve-entity-identity sno-ai/sno-station · Skill Both about resolve | 70 | ★ 765 | ≈26 always | 16d ago |
| roo-conflict-resolution zgsm-ai/costrict · Skill Both about conflict and merge | 75 | ★ 4.5k | ≈84 always | 1mo ago |
| resolve-fusion samuelgursky/davinci-resolve-mcp · Skill Both about resolve and merge | 75 | ★ 3.6k | ≈83 always | 16d ago |