Library
85,340 resources from 11 public sources. 54 checked by hand; the rest are unreviewed.
Results
-
merge-conflict-forecaster-mcp
MCP serversPredict local Git merge-conflict pressure fro MCP: real tools for real work.
merge-conflict-forecaster-mcp@1.0.1 -
sf-decomposer
SkillsDecompose Salesforce metadata into granular, VCS-friendly files; recompose for deployment.
git clone https://github.com/mcarvin8/sf-decomposer.git -
GitWand
Tools & appsThe Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.
git clone https://github.com/devlint/GitWand.git -
semamerge
MCP serversDetects semantic merge conflicts between Git branches using AST-level analysis
semamerge@0.1.2 -
mergelock
MCP serversFinds merge conflicts git can't see between branches: changed signatures vs new callers.
ghcr.io/sadayamuthu/mergelock:0.1.5 -
conflictfix
MCP serversClassify merge-conflict hunks as safe mechanical resolutions or risky; risky hunks stay manual.
@reneturcios/conflictfix@0.1.0 -
fanout
SkillsFewer broken merges from parallel Claude Code and Codex sessions: tests every branch merged together before main, and tells each session when another changes code it uses. Works with worktrees. No dependencies.
git clone https://github.com/Breadstick-Crumbs/fanout.git -
agent-skills
Skills🧰 55 Agent Skills: resolve merge conflicts, guardrail your agent, TDD, fix architecture, polish UI, roast your GitHub, bisect bugs and catch AI slop. Tested, one-line install. Claude Code, Cline, Cursor, Codex
git clone https://github.com/milad-ahmd/agent-skills.git
Indexed entries aren't reviewed or tested by InnerVault. Details come straight from each source. Anything that can reach your accounts, files or browser can do damage, so read the source before you install it.