Gitwand, developed by Devlint, is an MCP server tool and version control developer tool running on the mcp platform. Its core engine is built with Rust and its user interface with Vue 3. Gitwand connects to local Git repositories and integrates with remote hosting services. It aims to assist developers in managing merge conflicts and enhancing their Git workflows, functioning as an MCP server that exposes its conflict resolution engine to AI agents and compatible clients. This program provides tools for automated and AI-assisted conflict handling.

What does Gitwand connect to?

Gitwand connects to local Git repositories and integrates with remote hosting services including GitHub, GitLab, Bitbucket, Azure DevOps, and Gitea. As an MCP server, it connects to AI agents and compatible MCP clients such as Claude Code, Claude Desktop, Cursor, and Windsurf, exposing its conflict resolution engine. It also supports other agents like opencode, Codex, and Antigravity. Gitwand automatically detects the forge from the remote URL for hosting services, making integration straightforward for developers.

Core features and tools

Gitwand provides several callable tools for conflict management. The command "gitwand resolve" auto-discovers and resolves all conflicted files, or specific ones when file paths are provided. Users can preview changes with "gitwand resolve --dry-run --verbose". "gitwand status" checks the conflict status of files. Additionally, an agent-callable tool, "gitwand_preview_merge", assesses conflict complexity and the percentage Gitwand can auto-resolve, assisting AI agents in their operations. These tools support efficient conflict resolution.

Who is it for?

Gitwand is for developers seeking to manage Git merge conflicts more efficiently and enhance their version control workflows. It serves as an advanced alternative to simpler Git clients, particularly benefiting those who frequently encounter merge conflicts or utilize AI agents for code tasks. It is also valuable for teams working across various Git hosting services. This is not the right fit if you primarily use basic Git commands and rarely encounter merge conflicts.

How to get started

Access is granted through a standard OAuth authorization flow for GitHub and App Passwords for Bitbucket. The MCP server requires no credentials, operating locally via stdio.

Use cases

• Automated Merge Conflict Resolution: Gitwand automatically resolves trivial Git merge conflicts using deterministic patterns, reducing manual effort.
• AI-Assisted Conflict Resolution: It enables AI agents to address complex merge conflicts by handling trivial hunks first, then providing full context for ambiguous cases.
• Integrated Pull Request Review: Users can perform a complete pull or merge request workflow, including browsing, creating, checking out, and merging, across multiple hosting services.

Gitwand offers developers a specialized tool for managing Git merge conflicts and pull request workflows. Its MCP server capabilities allow AI agents to assist in complex resolutions, while its desktop and CLI tools provide direct control. The program's integration with major Git hosting services simplifies distributed development. Its focus on conflict resolution and AI agent interaction addresses specific developer needs. Try "gitwand resolve" to experience its automated conflict resolution capabilities.