# 使用 Homebrew, apt 安装 git-mediate

查看 git-mediate 的安装路径、可执行文件、元数据以及面向 AI 代理工作流的安全说明。

## 安装

```sh
sudo av install brew:git-mediate
```

其他安装命令:

### macOS

- Homebrew (100%):

```sh
brew install git-mediate
```

  证据: local Homebrew formula metadata

### Linux

- Debian apt (92%):

```sh
sudo apt install git-mediate
```

  证据: Debian stable package indexes: git-mediate from https://deb.debian.org/debian/dists/stable/main/binary-amd64/Packages.xz

## 软件包事实

- **软件包键:** brew:git-mediate
- **软件包管理器:** Homebrew
- **版本:** 1.1.0
- **来源摘要:** Utility to help resolve merge conflicts
- **主页:** <https://github.com/Peaker/git-mediate>
- **仓库:** <https://github.com/Peaker/git-mediate>
- **最后更新:** 2026-07-22T05:53:20Z
- **已生成:** 2026-08-03T19:37:03+00:00

## 可执行文件

- git-mediate (别名)

## 安装行为

- Bottle: 不可用

## 版本和新鲜度

- 页面生成时间: 2026-08-03
- 管理器版本: 1.1.0
## 项目历史与用法

git-mediate is a Haskell Git helper for resolving merge conflicts that have become mechanically trivial. It is built around Git's diff3 and zdiff3 conflict styles, where the base version is visible alongside both sides of a conflict.

### 项目历史

Eyal Lotem began the project in December 2014 under the name resolve-trivial-conflicts. The changelog records early work on conflict display, terminal color handling, modify/delete conflicts, add/add conflicts, and diff2 output.

In December 2016 the project was renamed to git-mediate, reached version 1.0, and received its first Hackage release. Later releases added Windows compatibility fixes, a `--merge-file` option, line-ending handling, nested-conflict parsing fixes, zdiff3 awareness, and editor improvements.

### 采用历史

git-mediate is a niche but well-sourced conflict-resolution utility. Its README lists installation through Homebrew, Debian packages, Arch's AUR, Haskell Stack, and source builds, while the changelog notes its Debian unstable entry in July 2023.

### 使用方式

Practitioners first configure Git to use diff3 or zdiff3 conflict style, then manually make simple changes across the conflict sections. Running `git-mediate` detects conflicts where one side can be selected or where markers have been removed, resolves what it can, and runs `git add` for files with all conflicts resolved.

The `-d` flag displays conflict diffs from the base, and `-e` opens an editor for conflicted files that cannot be resolved automatically. This makes the tool useful during manual conflict cleanup rather than as a full merge driver replacement.

### 为什么软件包爱好者会关心

git-mediate is package-nerd interesting because it embraces Git's existing conflict-marker formats instead of inventing a new merge UI. It is small, scriptable, and distributed through both Haskell and operating-system package channels.

### 时间线

- 2014: Development started as resolve-trivial-conflicts.
- 2014: v0.2 added remaining-conflict display.
- 2016: Renamed to git-mediate and released on Hackage.
- 2023: Debian unstable packaging appeared.
- 2024: v1.1.0 added split-marker and line-added-around options.

### Related projects

- git-mediate relates to Git's merge conflict styles, especially diff3 and zdiff3. It complements visual merge tools and Git rerere by helping after a user has made a conflict simple enough to resolve mechanically.

### 来源

- <https://api.github.com/repos/Peaker/git-mediate>
- <https://formulae.brew.sh/formula/git-mediate>
- <https://github.com/Peaker/git-mediate#readme>
- <https://github.com/Peaker/git-mediate/blob/master/ChangeLog.md>
- <https://hackage.haskell.org/package/git-mediate>


## 安全说明

broad file, network, media, or database tool signal.

- **Geiger 风险:** blue / 中
- broad file, network, media, or database tool signal

## 其他软件包管理器记录

- Debian apt - git-mediate - 1.0.9-1: normalized package name match | Debian stable package indexes: git-mediate from https://deb.debian.org/debian/dists/stable/main/binary-amd64/Packages.xz | tool to help resolving git conflicts | https://github.com/Peaker/git-mediate
- Ubuntu apt - git-mediate - 1.0.9-1: normalized package name match | Ubuntu 24.04 LTS package indexes: git-mediate from https://archive.ubuntu.com/ubuntu/dists/noble/universe/binary-amd64/Packages.gz | tool to help resolving git conflicts | https://github.com/Peaker/git-mediate


## Combined YAML source

View the package source record on GitHub. [combined/git-mediate.yml](https://github.com/mxcl/pkgdb/blob/main/combined/git-mediate.yml)


## 来源

- pkg.so package database
- Geiger risk classifier
- curated package history
- pkgdb category and tag curation
- external package-manager database matches
- cross-ecosystem install command graph