# Install git-mediate with Homebrew, apt Utility to help resolve merge conflicts. Version 1.1.0 via Homebrew; verified from local package data. ## 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 - **Package manager page:** - **Version:** 1.1.0 - **Source summary:** Utility to help resolve merge conflicts - **Homepage:** - **Repository:** - **Upstream docs:** - **License:** GPL-2.0-only - **Source archive:** - **Generated:** 2026-07-08T07:18:31+00:00 ## Executables - git-mediate (cli) - git-mediate (alias) ## Dependencies - gmp ## Build dependencies - cabal-install - ghc ## Uses from macOS - libffi ## Install behavior - Post-install hook: not defined - Bottle: available on arm64_linux, arm64_sequoia, arm64_sonoma, arm64_tahoe, arm64_ventura, sonoma, ventura, x86_64_linux ## Freshness - Page generated: 2026-07-08 - Package-manager version: 1.1.0 - Local data: ok - Upstream repository: https://github.com/Peaker/git-mediate - Upstream latest detected: 1.1.0 (current) - info: No package-manager update timestamp was available. ## 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 - - - - - ## Security Notes broad file, network, media, or database tool signal. - **Geiger risk:** blue / medium - broad file, network, media, or database tool signal ## Source Database Details - **Source Database:** Homebrew formula API - **Tap:** homebrew/core - **Full Name:** git-mediate - **Version Scheme:** 0 - **Revision:** 0 - **Bottle Stable Root URL:** - **Deprecated:** no - **Disabled:** no - **Keg Only:** no - **URL Keys:** stable ## 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 ## Related links - [Source-control packages](https://www.automicvault.com/pkg/source-control-tools/) - Belongs to a source-control command family. - [Secret-risk packages](https://www.automicvault.com/pkg/secret-risk-packages/) - Has protected-tool coverage, approval-gate, or non-low Geiger security signals. - [Terminal utility packages](https://www.automicvault.com/pkg/terminal-utilities/) - Matched terminal and command-line workflow metadata. - [Text processing packages](https://www.automicvault.com/pkg/text-processing-tools/) - Matched text, document, or structured-data processing metadata. - [cabal-install](https://www.automicvault.com/pkg/brew/cabal-install/) - Build dependency declared by Homebrew. - [ghc](https://www.automicvault.com/pkg/brew/ghc/) - Build dependency declared by Homebrew. - [git-octopus](https://www.automicvault.com/pkg/brew/git-octopus/) - Shares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, git-extension. - [git-imerge](https://www.automicvault.com/pkg/brew/git-imerge/) - Shares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, merge-tools. - [mergiraf](https://www.automicvault.com/pkg/brew/mergiraf/) - Shares av.db curated category or tags: cli, developer-tools, git, merge-tools, version-control. - [git-lfs](https://www.automicvault.com/pkg/brew/git-lfs/) - Shares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control. - [git-machete](https://www.automicvault.com/pkg/brew/git-machete/) - Shares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control. - [git-multipush](https://www.automicvault.com/pkg/brew/git-multipush/) - Shares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control. - [git-now](https://www.automicvault.com/pkg/brew/git-now/) - Shares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control. - [git-number](https://www.automicvault.com/pkg/brew/git-number/) - Shares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control. ## Combined YAML source View the package source record on GitHub. [combined/git-mediate.yml](https://github.com/automic-vault/db/blob/main/combined/git-mediate.yml) ## Sources - Nucleus package database - Geiger risk classifier - package-page enrichment - curated package history - package version freshness - av.db category and tag curation - package relationship graph - external package-manager database matches - cross-ecosystem install command graph