gitwand for VS Code
io.github.devlint/gitwand
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
client:VS Code
transport:stdio
runtime:npm
Install gitwand in VS Code
.vscode/mcp.json
{
"servers": {
"gitwand": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}Requires agent mode. MCP: Open User Configuration puts the same block in every workspace. VS Code docs