Automic VaultAutomic Vault

brew

Install git-mediate with Homebrew, apt

Utility to help resolve merge conflicts. Version 1.1.0 via Homebrew; verified from local package data.

Install commandSecurity notes

install

Additional install commands

macOS

Homebrewverified · 100%
brew install git-mediate

local Homebrew formula metadata

Linux

Debian aptverified · 92%
sudo apt install git-mediate

Debian stable package indexes · git-mediate · source: deb.debian.org

overview

Package summary

Utility to help resolve merge conflicts

Commands and aliases

  • git-mediate

history

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.

security posture

Risk level: blue

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

Risk classifier

blue risk · medium confidence · tool

Why

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

Signals

  • text:media

Install behavior

  • No Homebrew post-install hook is recorded in formula metadata.
  • Homebrew bottle metadata is available for 8 platform targets.
  • Installs with 1 runtime dependencies.
  • Build metadata lists 2 build dependencies.

Recommended review

Before unattended agent use, check whether the tool reads plaintext credentials, writes remote state, publishes artifacts, or shells out to plugins.

executables

Installed executables

CommandKindExposureNote
git-mediatecliglobal executable

freshness

Version and freshness

These signals separate page generation age, package-manager activity, and upstream release comparison. Version lag is warned only when an evidence URL and comparable versions are present.

page generated2026-07-08
manager version1.1.0
manager updated
local dataok
upstreamcurrent
latest detected1.1.0

https://github.com/Peaker/git-mediate

  • infoNo package-manager update timestamp was available.low confidence

install metadata

Package metadata

Package keybrew:git-mediate
Version1.1.0
Package managerHomebrew
Package manager pagehttps://formulae.brew.sh/formula/git-mediate
Homepagehttps://github.com/Peaker/git-mediate
Repositoryhttps://github.com/Peaker/git-mediate
Upstream docshttps://github.com/Peaker/git-mediate#readme
LicenseGPL-2.0-only
Source archivehttps://github.com/Peaker/git-mediate/archive/refs/tags/1.1.0.tar.gz
Dependenciesgmp
Build dependenciescabal-install, ghc
Uses from macOSlibffi
Bottleavailable (on arm64_linux, arm64_sequoia, arm64_sonoma, arm64_tahoe, arm64_ventura, sonoma, ventura, x86_64_linux)
Homebrew post-installnot defined
Servicenone declared

registry facts

Source database details

Source DatabaseHomebrew formula API
Taphomebrew/core
Full Namegit-mediate
Version Scheme0
Revision0
Bottle Stable Root URLhttps://ghcr.io/v2/homebrew/core
Deprecatedno
Disabledno
Keg Onlyno
URL Keys
  • stable

source database matches

Other package-manager records

Matches are pulled from external package-manager indexes and kept separate from local Automic Vault package links.

Debian apt95%

git-mediate 1.0.9-1

tool to help resolving git conflicts

https://github.com/Peaker/git-mediate

sudo apt install git-mediate
  • Section: vcs
  • Architecture: amd64
  • Source Package: haskell-git-mediate
  • 3 dependencies
  • normalized package name match
  • Matched by: Git Mediate
Debian stable package indexes · deb.debian.org · Debian stable package indexes: git-mediate from https://deb.debian.org/debian/dists/stable/main/binary-amd64/Packages.xz
Ubuntu apt95%

git-mediate 1.0.9-1

tool to help resolving git conflicts

https://github.com/Peaker/git-mediate

sudo apt install git-mediate
  • Section: universe/vcs
  • Architecture: amd64
  • Source Package: haskell-git-mediate
  • 3 dependencies
  • normalized package name match
  • Matched by: Git Mediate
Ubuntu 24.04 LTS package indexes · archive.ubuntu.com · Ubuntu 24.04 LTS package indexes: git-mediate from https://archive.ubuntu.com/ubuntu/dists/noble/universe/binary-amd64/Packages.gz

package graph

Links come from deterministic package relationships, av.db category and tag curation, ecosystem matches, and package hub membership.

Related tools

  • cabal-installBuild dependency declared by Homebrew.
  • ghcBuild dependency declared by Homebrew.

Same workflow

  • git-octopusShares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, git-extension.
  • git-imergeShares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, merge-tools.
  • mergirafShares av.db curated category or tags: cli, developer-tools, git, merge-tools, version-control.
  • git-lfsShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.
  • git-macheteShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.
  • git-multipushShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.

source trail

Generated from repository data

This page is generated by av-web from the private package SQLite artifact built by scripts/generate-pkg-sqlite.py.

Used sources

  • Geiger risk classifier
  • Nucleus package database
  • av.db category and tag curation
  • cross-ecosystem install command graph
  • curated package history
  • external package-manager database matches
  • package relationship graph
  • package version freshness
  • package-page enrichment