# Install git-mediate with Homebrew, apt

Utility to help resolve merge conflicts. Version 1.1.0 via Homebrew; verified 2026-07-22. Also installable with debian: sudo apt install git-mediate.

## Install

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

Additional install commands:

### macOS

- Homebrew (100%):

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

  Evidence: local Homebrew formula metadata

### Linux

- Debian apt (92%):

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

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

## Package facts

- **Package key:** brew:git-mediate
- **Package manager:** Homebrew
- **Version:** 1.1.0
- **Source summary:** Utility to help resolve merge conflicts
- **Homepage:** <https://github.com/Peaker/git-mediate>
- **Repository:** <https://github.com/Peaker/git-mediate>
- **Last updated:** 2026-07-22T05:53:20Z
- **Generated:** 2026-08-03T19:37:03+00:00

## Executables

- git-mediate (alias)

## Install behavior

- Bottle: not available

## Freshness

- Page generated: 2026-08-03
- Package-manager version: 1.1.0
## Project history and usage

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.

### Project history

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.

### Adoption history

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.

### How it is used

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.

### Why package nerds care

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.

### Timeline

- 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.

### Sources

- <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>


## Security Notes

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

- **Geiger risk:** blue / medium
- broad file, network, media, or database tool signal

## Other Package-Manager Records

- 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)


## Sources

- 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