{"name":"io.github.devlint/gitwand","slug":"devlint-gitwand","title":null,"description":"Auto-resolves Git merge conflicts so agents only touch the complex hunks.","url":"https://mcp.market/server/devlint-gitwand","rating":null,"grade":"A","score":92,"certified":false,"status":"active","category":"devtools","tags":["devtools"],"presence":{"score":48,"stars":176,"forks":8,"downloads_week":156,"last_push_at":"2026-09-18T14:26:28.000Z","license":"MIT"},"uptime":null,"claimed":false,"transport":"npm","callable_via_gateway":false,"default_price_micros":0,"repository":"https://github.com/devlint/GitWand","website":null,"version":"3.10.1","remotes":[],"packages":[{"registryType":"npm","identifier":"@gitwand/mcp","version":"3.10.1","transport":{"type":"stdio"}}],"tools":[{"name":"gitwand_apply_resolution","description":"Apply a custom resolution (provided by the LLM or user) to a specific conflict hunk. Replaces the conflict markers at the given line range with the provided content. Use this for 'complex' hunks that GitWand couldn't auto-resolve.","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_explain_hunk","description":"Explain why a specific conflict hunk was classified as its type. Returns the DecisionTrace with each evaluation step and the ours/theirs/base content for context.","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_preview_merge","description":"Side-effect-free Conflict Predictor. Simulates a merge, rebase, or cherry-pick and reports how many conflicts GitWand can auto-resolve vs. how many need manual/LLM attention, plus an overall risk level (low/medium/high). Does NOT modify the working tree, index, or HEAD. - operation 'merge' (default): analyzes conflicts already materialized in the working tree (files with conflict markers). - opera","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_resolve_conflicts","description":"Auto-resolve trivial Git merge conflicts using GitWand's pattern-based engine. Returns resolved files, DecisionTrace for each hunk, and pendingHunks for conflicts that need human/LLM review. Writes resolved files to disk unless dry_run is true.","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_resolve_hunk","description":"Ask the connected AI agent (the caller of this MCP server) to propose a resolution for a single Git merge conflict hunk.","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_resolve_hunk_llm","description":"Validate and apply an LLM-proposed resolution for a specific conflict hunk.","write_action":false,"price_micros":0,"input_schema":null},{"name":"gitwand_status","description":"List conflicted files in the current Git repo with their complexity and auto-resolvability. Returns a structured JSON report with conflict counts, types, and confidence scores.","write_action":false,"price_micros":0,"input_schema":null}],"scan":{"score":92,"grade":"A","scanned_at":"2026-09-19T19:17:45.926Z","report":{"scannerVersion":"0.1.5","scannedAt":"2026-09-19T19:17:45.878Z","components":{"code":{"score":25,"max":25,"notes":["13 source files scanned"]},"reliability":{"score":-1,"max":20,"notes":["no gateway calls yet and no remote to probe"]},"poisoning":{"score":-1,"max":15,"notes":["tools not inspected (local package is not executed); not counted"]},"auth":{"score":12,"max":15,"notes":["local package, no credentials required"]},"maintenance":{"score":15,"max":15,"notes":["last push 1 days ago"]},"identity":{"score":8,"max":10,"notes":["registry namespace matches repository owner","GitHub account older than a year"]}},"findings":[],"inputs":{"packages":[{"registryType":"npm","identifier":"@gitwand/mcp","version":"3.10.1","found":true,"license":"MIT","hasInstallScripts":false,"dependencyCount":2,"publishedAt":"2026-09-09T17:28:30.816Z","repositoryUrl":"git+https://github.com/devlint/GitWand.git","weeklyDownloads":156}],"repo":{"found":true,"owner":"devlint","repo":"GitWand","archived":false,"pushedAt":"2026-09-18T14:26:28Z","stars":176,"forks":8,"openIssues":1,"ownerType":"User","ownerAvatarUrl":"https://avatars.githubusercontent.com/u/835489?v=4","ownerCreatedAt":"2011-06-07T15:50:08Z","license":"MIT"},"icon":{"url":"https://avatars.githubusercontent.com/u/835489?v=4&s=128","source":"github"},"presence":{"stars":176,"forks":8,"downloadsWeek":156,"license":"MIT","lastPushAt":"2026-09-18T14:26:28.000Z","score":48}}}},"grade_history":[],"reviews":[]}