macOS
Homebrewverifiziert · 100%
brew install git-mediatelocal Homebrew formula metadata
brew / Rang 11288
git-mediate mit Homebrew, apt installieren
Prüfe Installationswege, Executables, Metadaten und Sicherheitshinweise für git-mediate in AI-Agent-Workflows.
Installation
Weitere Installationsbefehle
Linux
Debian aptverifiziert · 92%
sudo apt install git-mediateDebian stable package indexes · git-mediate · Quelle: deb.debian.org
Überblick
Paketzusammenfassung
Utility to help resolve merge conflicts
Projektlinks
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.
Quellen
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
- Es wurden keine Homebrew-Bottle-Metadaten erfasst.
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
| Befehl | Art | Sichtbarkeit | Hinweis |
|---|---|---|---|
git-mediate | Executable | indexiertes Executable | Aus dem lokalen Executable-Index erkannt. |
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-08-03
Manager-Version1.1.0
Manager aktualisiert2026-07-22
lokale Datenunbekannt
Upstreamnicht verfügbar
neueste erkannte Versionnicht erkannt
- OKEs wurden keine Aktualitätswarnungen generiert.
Installationsmetadaten
Paketmetadaten
| Paketschlüssel | brew:git-mediate |
|---|---|
| Version | 1.1.0 |
| Paketmanager | Homebrew |
| Homepage | https://github.com/Peaker/git-mediate |
| Repository | https://github.com/Peaker/git-mediate |
| Zuletzt aktualisiert | 2026-07-22T05:53:20Z |
| Pulse | updated |
| Bottle | nicht erfasst |
| Dienst | keiner deklariert |
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
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
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.
Combined YAML source
View the package source record on GitHub.
Verwendete Quellen
- Geiger risk classifier
- cross-ecosystem install command graph
- curated package history
- external package-manager database matches
- pkg.so package database
- pkgdb category and tag curation