Gitwand

Name: Gitwand
Author: devlint

作者：devlint版本 3.12.5i★ –i在你的电脑上运行

注册名称io.github.devlint/gitwand

安装

概览

作者提供的说明（英文原文）

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

PopNx MCP 的三大支柱

这三项永远不会合并成一个分数：意见、测量和人气是不同的东西。

用户评价i暂无评价评价功能将在后续阶段与账户功能一起开放
我们的基础检查i1 项中通过 1 项依据公开信息检查；尚未扫描代码
使用情况i尚未统计★ –

它能帮你做什么

我们还没有为它写通俗的介绍。下面是我们从注册中心读取到的事实。

连接方式: 在你的电脑上运行
传输方式: stdio
分类: 开发者工具

安装

选择你使用的 AI 应用，然后复制设置。

安装之前

基础检查：1 项中通过 1 项
在你的电脑上运行，拥有你的用户账户的权限（文件、网络、应用）。
注册中心没有列出需要填写的密钥。

你需要

npm已安装 Node.js（用于 npx 命令）

你用的是哪个应用？

ClaudeClaude CodeCursorVS CodeChatGPT

在上方选择你的应用。我们会记住它，下次按钮会显示“安装到 …”。

打开 Claude Desktop → Settings → Developer → Edit Config，把下面的内容粘贴到 claude_desktop_config.json

{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

在终端中运行这条命令

claude mcp add gitwand -- npx -y @gitwand/mcp

在 Cursor 中打开

或者自己复制设置

粘贴到项目中的 .cursor/mcp.json，或 ~/.cursor/mcp.json

{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

浏览器会先询问是否打开应用，然后应用会显示设置并请你确认。密钥的值会留空，由你自己填写。

在 VS Code 中打开

或者自己复制设置

粘贴到项目中的 .vscode/mcp.json

{
  "servers": {
    "gitwand": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

浏览器会先询问是否打开应用，然后应用会显示设置并请你确认。密钥的值会留空，由你自己填写。

这个服务器在你的电脑上运行，而 ChatGPT 只能连接互联网上的服务器。请选择其他应用。

你的选择通过 Cookie 保存在这台设备上，无需账户。

这些设置是根据作者在注册中心的条目生成的。如果 README 的写法不同，请以 README 为准。

它能做什么

它在你的电脑上运行；安装后，工具列表会显示在你的 AI 应用中。

基础检查i

我们检查的是任何人都能看到的信息；我们没有阅读代码。不适用的检查项不计入总数。 · 检查于 2026年11月6日

✓ 通过
作者与仓库一致
注册名称已通过 GitHub 账户 devlint 验证，该账户拥有此仓库
… 尚未检查
仍在维护
我们还没有从 GitHub 读取这个仓库
… 尚未检查
有许可证
我们还没有从 GitHub 读取这个仓库
– 不适用
端点有响应
它在你的电脑上运行，没有互联网端点
– 不适用
使用 OAuth 登录
在你的电脑上运行，改用本地设置
… 尚未检查
工具描述中没有隐藏指令
它在你的电脑上运行；我们只能读取互联网端点的工具列表

与“开发者工具”中的其他服务器比较i

星标数多于此分类中其他 1384 个服务器的 0%
发布到注册中心的时间比此分类中其他 1384 个服务器的 93% 更新
基础检查结果等于或优于此分类中其他 1384 个服务器的 100%

与注册中心里这个分类中所有活跃的服务器比较。只有当发布者拥有该仓库时，星标数才计入。

常见问题

Gitwand 安全吗？

它在 1 项适用的基础检查中通过了 1 项。我们没有阅读代码。在添加密钥或令牌之前，请先看看这个服务器要求哪些权限，并使用只具备所需权限的密钥。

它需要哪些密钥或代码？

注册中心没有列出必需的密钥，不过有些服务器会在首次使用时要求你登录。

它在我的电脑上运行还是在云端？

它在你的电脑上运行。你的 AI 应用会在需要时启动它，数据不会经过作者的服务器（除非它自己调用在线服务）。

它还在维护吗？

GitHub 仓库最后更新于–，最新版本（3.12.5）于3天前进入注册中心。

哪些应用可以使用它？

支持 MCP 的应用，例如 Claude Desktop、Claude Code、Cursor 和 VS Code。你的电脑上还需要有 Node.js。

有什么可以替代它？

同一分类中有：GitHub, Desktop Commander, Cloudflare MCP

替代选择

同一分类中其他作者的服务器，按星标数排序。

如何看卡片：★ GitHub 星标i三大支柱：评价 · 检查 · 使用情况i更新 = 最新版本发布到注册中心的时间i

GitHub

作者：github

Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language.

电脑或云端★ 34,245MIT3天前更新

安装

Desktop Commander

作者：wonderwhy-er

MCP server for terminal commands, file operations, and process management

在你的电脑上运行★ 10,225MIT15天前更新

安装

Cloudflare MCP

作者：cloudflare

Cloudflare MCP servers

在云端运行★ 4,446Apache-2.014个月前更新

安装

作者的 README

打开 README

按原文从作者的仓库复制。PopNx MCP 没有审查或背书其内容。HTML、图片和脚本已被移除。链接会离开本站。

GitWand

A fast, native Git client with built-in smart conflict resolution

Desktop • Conflict engine • CLI • MCP Server • Architecture • Roadmap • Code signing

GitWand is a lightweight, native Git client built with Tauri 2 and Vue 3. It covers the full daily workflow — changes, history, branches, push/pull — and goes further with automatic resolution of trivial merge conflicts, integrated PR code review with inline comments, and a Git Tree as the primary history view. Since v1.3, AI assists every step of the workflow — branch naming, PR writing, hunk-level review, semantic squash, and natural-language commit search. v2.7+ adds multi-repo Workspaces and Worktrees; v2.8 adds Agent Sessions (MCP); v2.9 adds a cross-repo Launchpad; v2.10 brings multi-forge pull requests across GitHub, GitLab, Bitbucket and Azure DevOps; v2.13 adds inline AI code review; v2.18 overlays CI check annotations directly on the diff; v2.19 adds OAuth device-flow sign-in for GitHub and Azure DevOps (no gh CLI required) plus cross-fork pull requests. The 3.x line makes GitWand a daily driver for AI-assisted work: v3.0 turns the cross-repo dashboard into Today, a triaged action inbox, and publishes the VS Code extension on the Marketplace; v3.2 adds an integrated terminal with AI agent tabs — including one-click AI tasks in isolated worktrees — and a dockable File Explorer / Editor panel.

Desktop app

Git Tree

The Git Tree is the primary history view — a full-resolution DAG that renders the branch topology as an SVG with trunk-pinning, lane cooldowns, WIP node, and ref badges. Click any commit to see its diff; right-click to checkout, reset, branch, tag, or cherry-pick. Branches, stashes, and tags are all managed from here without a separate panel. A filter mode (v3.2) recalculates the DAG to show only matching commits, with quick branch/author toggles, date-bucket separators, branch-name autocomplete, and # lookup that resolves straight to the PR's branch.

Repository view

Staged, unstaged, untracked, and conflicted files in a sidebar with inline diffs in the main area. Stage, unstage, discard, and commit without leaving the interface. Partial staging at the line or hunk level.

Commit workflow

Summary + description fields, optional commit signature, Ctrl+Enter shortcut. Unpushed commits can be amended directly from the Git Tree — a pencil icon appears on hover, opening an overlay pre-filled with the existing message.

Branches

Click the branch name in the header to search, switch, create, or delete branches. Merge any branch from the dedicated merge button. Each non-current branch shows a merge preview button that simulates the merge result before committing.

Merge preview

Before merging a branch, GitWand predicts the outcome without touching the working tree — using git merge-base, git show, and git merge-file -p --diff3. The result shows a per-file breakdown:

Auto-resolvable — GitWand can handle it automatically
Partial — some hunks need manual resolution
Manual — complex conflicts requiring human judgment
Add/delete — file added on one side, deleted on the other

A badge summarises the overall result: Clean merge, 100% auto-resolvable, or N conflicts to review.

Push & Pull

One-click push and pull with badge counters showing ahead/behind commits. Auto-fetch runs in the background every 30 seconds.

Diff viewer

Side-by-side or inline toggle, persisted across sessions. Syntax highlighting for 30+ languages, word-level diff using LCS, collapsible unchanged regions, canvas minimap, hunk navigation (prev/next), double-column line numbers.

File history & blame

Full file history with git log --follow, blame view grouped by commit, time-travel diff between any two versions of a file.

Repo switcher & Workspaces

The current repo name in the header opens a dropdown showing recently opened repositories. Pin favourites, switch instantly — no file picker needed. Workspaces (v2.7) group multiple repos into a single dashboard with cross-repo status, coordinated push/pull, and quick-create worktrees (⌘⇧N). Each project tab carries a worktree submenu (v3.2) listing main plus every worktree — select one to switch that project's checkout in place, no extra tab.

Today

Today (⌘L; introduced as Launchpad in v2.9, reworked in v3.0) is a cross-repo triaged action inbox: everything in flight — WIP, PRs, Issues, Team — sorted into urgency tiers, each row carrying a state-aware primary action (Merge · Review · Resolve · Reply · See failure). Pin or snooze any item; the Team tab loads lazily for performance on large workspaces.

Pull Requests & Code Review

Browse, create, checkout, and merge pull/merge requests across GitHub, GitLab, Bitbucket and Azure DevOps without leaving the app. GitWand auto-detects the forge from the remote and routes to the right provider; accounts are managed once in Settings. The PR list sits in the sidebar and the full detail — diff, CI checks, comments, inline review — fills the main area.

Sign in with OAuth — "Sign in with GitHub" and "Sign in with Azure DevOps" use the OAuth device flow; tokens are stored in the OS keychain and the GitHub PR workflow runs tokenless over the REST API, with no `gh` CLI required (the CLI path still works when no token is configured)
Cross-fork pull requests — when origin is a fork, open a PR straight against the upstream parent (default), and see the PRs you opened upstream listed alongside your fork's own
Inline comments — read and write review comments anchored to diff lines, with full threading and code suggestions ( suggestion blocks applicable in one click)
Inline CI check annotations — failed-check annotations overlay the diff with gutter icons (❌/⚠/ℹ) and hover tooltips, with a per-file count in the sidebar (GitHub, GitLab and Bitbucket)
Review submission — Approve / Request changes / Comment, with a draft queue to accumulate comments before sending
🧠 Intelligence panel — conflict prediction (git merge-tree before merging), hotspot analysis, review scope, static AI suggestions, file review history

Agent Sessions

The Agents panel (v2.8) shows active MCP sessions and lets you launch Claude Code directly from GitWand — the agent's changes appear live in the diff viewer. The MCP catalog (Settings > MCP) lets you install any MCP server in one click.

Integrated terminal & AI tasks

The terminal panel (v3.2) renders through WebGL with inline search (Ctrl+F), clickable links, and typed tabs — shell, claude, codex — each with its own icon and an unread-output dot. "Launch Claude Code" / "Launch Codex" open a real PTY tab, and "New AI task" creates a scratch git worktree and opens a Claude Code tab in it in one click — the agent works in isolation, and when it's done you either merge the work back or delete the worktree from the project tab's submenu. Hardened with a shell-executable whitelist, safe_repo_path() on all filesystem operations, and PTY orphan prevention.

File Explorer / Editor

A dockable Files panel (v3.2, drag/resize/fullscreen) lists the full repo tree — gitignore-aware, via git ls-files — and opens files in a lazy-loaded CodeMirror 6 editor with syntax highlighting, per-tab undo history, and a lock/undo/save toolbar. Reachable from the Files tile in the AppDock, with per-repo layout settings.

Settings

Language (English, French, Spanish, Brazilian Portuguese, Simplified Chinese — OS auto-detected), theme (dark/light/system), commit signature, diff mode, external editor, Git binary path, and switch behavior (stash/ask/refuse). AI providers cover API backends (Claude / OpenAI-compatible / Ollama) and local CLI agents (Claude Code, Codex, opencode, GitHub Copilot CLI), each with its own model picker. Accounts manages forge sign-in — OAuth device flow for GitHub and Azure DevOps, App Passwords / CLI for the others. All persisted in app settings.

Installing

Download the latest build for your platform from GitHub Releases:

macOS — .dmg (Universal: Apple Silicon + Intel, Developer ID signed + Apple-notarized)
Linux — .AppImage or .deb
Windows — .msi or .exe

On Windows, you can also install via winget:

winget install Devlint.GitWand

Running from source

git clone https://github.com/devlint/GitWand.git

cd GitWand pnpm install

Browser dev mode — no Rust needed

cd apps/desktop && pnpm dev:web

Tauri desktop mode — requires Rust toolchain

Install Rust: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh

source "$HOME/.cargo/env"

Desktop Dev Build (In the apps/desktop/ folder)

pnpm --filter desktop tauri dev

On linux you may have to run

WEBKIT_DISABLE_COMPOSITING_MODE=1 pnpm --filter desktop tauri dev

Conflict resolution engine

GitWand's core engine (@gitwand/core) automatically resolves trivial Git merge conflicts. It never touches complex or ambiguous hunks.

Resolution patterns

GitWand uses a pattern registry — the classifier evaluates patterns in priority order, each declaring whether it requires diff3 (base available), diff2, or works on both.

The registry holds 12 patterns, of which 8 auto-apply. The other four either propose a resolution you confirm, are opt-in, or hand the hunk back untouched.

Pattern	Priority	Auto-applies	Description	Typical confidence
same_change	10	Yes	Both branches made the exact same edit	Certain
delete_no_change	20	Yes	One side deleted the block, the other left it untouched	Certain
one_side_change	30	Yes	Only one branch modified the block	Certain
non_overlapping	40	Yes	Additions at different locations in the block	High
whitespace_only	50	Yes	Same logic, different indentation/spacing	High
reorder_only	55	Yes	Same lines, different order, a pure permutation	High
insertion_at_boundary	57	Yes	Pure insertions on both sides, base intact	High
value_only_change	60	Yes	Both sides changed the same scalar (version, hash, timestamp)	High to medium
token_level_merge	65	No, proposes	Disjoint token edits on the same line, merged into a proposal you confirm	Medium
refactoring_aware_merge	970	No, opt-in	Rename or move detected and replayed across the conflict	High
llm_proposed	998	No, opt-in	Model-proposed resolution, validated post-merge	Medium
complex	999	No	Overlapping edits, always surfaced with a full trace	Low

The confidence column is indicative: every hunk carries a computed ConfidenceScore (see below), not a fixed label. value_only_change, for instance, scores on the ratio of volatile to

只显示了开头部分；其余内容请在仓库中阅读