Use GitWand's MCP server to automatically resolve Git merge conflicts from any AI agent (Claude, Claude Code, Cursor, Windsurf, etc.).
How to install gitwand-mcp?
devlint/gitwand/gitwand-mcp
$npx -y skills add devlint/gitwand --skill gitwand-mcpInstalls into the current project.
›Prefer a prompt? Paste this to your agent
Run `npx skills use "https://github.com/devlint/gitwand" --skill "devlint/gitwand/gitwand-mcp"` and follow the generated skill instructions now. Read its complete output, redirecting it to a temporary file first if necessary. Resolve relative paths from the supporting-files directory it provides.
Use the skills in "https://github.com/devlint/gitwand" that are relevant to the current task. Run `npx skills add "https://github.com/devlint/gitwand"` and select the relevant skills, then follow their instructions.
Related
6 picksType
- find-skillsHelps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express…Jul 2026
- mcp-builderGuide for creating high-quality MCP (Model Context Protocol) servers that enable LLMs to interact with external services through well-designed tools.Jul 2026
- google-agents-cli-adk-codeThis skill should be used when the user wants to "write agent code", "build an agent with ADK", "add a tool", "create a callback", "define an agent", "use…Jul 2026
- google-agents-cli-workflowThis skill should be used when the user wants to "develop an agent", "build an agent using ADK", "run the agent locally", "debug agent code", "test an agent",…Jul 2026
- google-agents-cli-evalThis skill should be used when the user wants to "run an evaluation", "evaluate my ADK agent", "write an eval dataset", "analyze eval failures", "compare eval…Jul 2026
- google-agents-cli-scaffoldThis skill should be used when the user wants to "create an agent project", "start a new ADK project", "build me a new agent", "add CI/CD to my project", "add…Jul 2026
