gitwand-mcp — independently scanned and version-tracked by SaferSkills.
SaferSkills independently audited gitwand-mcp (Agent Skill) and scored it 100/100 (green). The audit ran 55 deterministic rules across Security, Supply Chain, Maintenance, Transparency, and Community; it found 0 high-severity and 0 lower-severity findings. The full rule-by-rule trace and per-finding evidence are below. Free, methodology-open.
Findings & checks · 0 flagged
Every scanned point with the score it earned and what moved between them.
First recorded scan — no prior version to compare against.
The primary manifest — the file an agent reads to learn what this artifact does.
Use GitWand's MCP server to automatically resolve Git merge conflicts from any AI agent (Claude, Claude Code, Cursor, Windsurf, etc.).
npx @gitwand/mcpOr add to your MCP client config (Claude Desktop, Claude Code, etc.):
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": ["@gitwand/mcp"]
}
}
}| Tool | Description |
|---|---|
gitwand_status | List conflicted files with complexity scores and auto-resolvability percentages |
gitwand_resolve_conflicts | Auto-resolve trivial conflicts. Returns DecisionTrace + pendingHunks for complex ones |
gitwand_preview_merge | Dry-run — assess resolvability without modifying files |
gitwand_explain_hunk | Explain why a specific hunk is complex (full DecisionTrace) |
gitwand_apply_resolution | Apply a custom resolution you provide to a specific hunk |
| URI | Description |
|---|---|
gitwand://repo/conflicts | Live conflict state — files, counts, and auto-resolvability |
gitwand://repo/policy | Current .gitwandrc config (merge policies, confidence thresholds) |
gitwand://hunk/{file}/{line} | Raw ours/theirs/base content + confidence for a specific hunk |
pendingHunks:Pass policy to gitwand_resolve_conflicts:
prefer-theirs (default) — take the incoming branch's version when safeprefer-ours — favour the current branchprefer-merge — attempt a three-way mergeprefer-safety — only resolve with very high confidencestrict — resolve only non-overlapping / whitespace-only conflicts~30 seconds. Free. No account. Every finding cites a rule and a line of evidence.