Automic VaultAutomic Vault

brew

git-mediate mit Homebrew, apt installieren

Prüfe Installationswege, Executables, Metadaten und Sicherheitshinweise für git-mediate in AI-Agent-Workflows.

InstallationsbefehlSicherheitshinweise

Installation

Weitere Installationsbefehle

macOS

Homebrewverifiziert · 100%
brew install git-mediate

local Homebrew formula metadata

Linux

Debian aptverifiziert · 92%
sudo apt install git-mediate

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

Überblick

Paketzusammenfassung

Utility to help resolve merge conflicts

Befehle und Aliase

  • git-mediate

Verlauf

Projektgeschichte und Nutzung

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.

Projektgeschichte

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.

Adoptionsgeschichte

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.

Wie es verwendet wird

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.

Warum Paket-Nerds sich dafür interessieren

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.

Zeitleiste

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

Sicherheitslage

Risikostufe: blue

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

Risikoklassifikator

blue Risiko · mittel Konfidenz · tool

Warum

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

Signale

  • text:media

Installationsverhalten

  • In den Formelmetadaten ist kein Homebrew-Post-install-Hook erfasst.
  • Homebrew-Bottle-Metadaten sind für 6 Plattformziele verfügbar.
  • Installiert mit 1 Laufzeitabhängigkeiten.
  • Build-Metadaten listen 2 Build-Abhängigkeiten.

Empfohlene Prüfung

Prüfe vor unbeaufsichtigter Agent-Nutzung, ob das Tool Klartext-Credentials liest, Remote-Zustand schreibt, Artefakte veröffentlicht oder Plugins ausführt.

Executables

Installierte Executables

BefehlArtSichtbarkeitHinweis
git-mediatecliglobales Executable

Aktualität

Version und Aktualität

Diese Signale trennen das Alter der Seitengenerierung, Aktivität des Paketmanagers und Upstream-Release-Vergleich. Versionsrückstand wird nur gemeldet, wenn eine Evidenz-URL und vergleichbare Versionen vorhanden sind.

Seite generiert2026-07-25
Manager-Version1.1.0
Manager aktualisiert2026-07-22
lokale DatenOK
Upstreamaktuell
neueste erkannte Version1.1.0

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

  • OKEs wurden keine Aktualitätswarnungen generiert.

Installationsmetadaten

Paketmetadaten

Paketschlüsselbrew:git-mediate
Version1.1.0
PaketmanagerHomebrew
Paketmanager-Seitehttps://formulae.brew.sh/formula/git-mediate
Homepagehttps://github.com/Peaker/git-mediate
Repositoryhttps://github.com/Peaker/git-mediate
Upstream-Dokumentationhttps://github.com/Peaker/git-mediate#readme
LizenzGPL-2.0-only
Quellarchivhttps://github.com/Peaker/git-mediate/archive/refs/tags/1.1.0.tar.gz
Zuletzt aktualisiert2026-07-22T05:53:20Z
Pulseupdated
Abhängigkeitengmp
Build-Abhängigkeitencabal-install, ghc
Von macOS bereitgestellte Bibliothekenlibffi
Bottleverfügbar (auf arm64_linux, arm64_sequoia, arm64_sonoma, arm64_tahoe, sonoma, x86_64_linux)
Homebrew post-installnicht definiert
Dienstkeiner deklariert

Registry-Fakten

Details aus der Quelldatenbank

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

Andere Paketmanager-Einträge

Treffer stammen aus externen Paketmanager-Indizes und bleiben von lokalen Automic-Vault-Paketlinks getrennt.

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 Abhängigkeiten
  • normalized package name match
  • Abgeglichen nach: 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 Abhängigkeiten
  • normalized package name match
  • Abgeglichen nach: 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

Paketgraph

Links stammen aus dem lokalen Paketbeziehungsgraph, Ergänzungen, Abhängigkeitskanten, Ecosystem-Matches und Paket-Hub-Mitgliedschaft.

Verwandte Tools

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

Gleicher Workflow

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

Quellspur

Aus Repository-Daten generiert

Diese Seite wird von av-web aus dem privaten Paket-SQLite-Artefakt bereitgestellt, das scripts/generate-pkg-sqlite.py erstellt.

Verwendete Quellen

  • 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