The 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.
Setup
Choose your client, copy the config, then fill in any required environment variables.
claude mcp add gitwand -- npx -y @gitwand/mcp~/.codex/config.toml
[mcp_servers.gitwand]
command = "npx"
args = ["-y", "@gitwand/mcp"]
# codex mcp add gitwand -- npx -y @gitwand/mcp~/.cursor/mcp.json
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}.vscode/mcp.json
{
"servers": {
"gitwand": {
"type": "stdio",
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}~/.gemini/settings.json
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}claude_desktop_config.json
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}.trae/mcp.json
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
}