macOS
Homebrew已验证 · 100%
brew install git-mediatelocal Homebrew formula metadata
安装
其他安装命令
Linux
Debian apt已验证 · 92%
sudo apt install git-mediateDebian stable package indexes · git-mediate · 来源: deb.debian.org
概览
软件包摘要
Utility to help resolve merge conflicts
历史
项目历史与用法
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.
项目历史
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.
采用历史
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.
使用方式
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.
为什么软件包爱好者会关心
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.
时间线
- 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.
来源
安全态势
风险级别：blue
broad file, network, media, or database tool signal.
风险分类器
blue 风险 · 中 置信度 · tool
原因
- broad file, network, media, or database tool signal
信号
- text:media
安装行为
- formula 元数据中未记录 Homebrew post-install 钩子。
- Homebrew bottle 元数据适用于 6 个平台目标。
- 安装时包含 1 个运行时依赖。
- 构建元数据列出 2 个构建依赖。
建议审查
在无人值守的代理使用前，请检查该工具是否读取明文凭据、写入远程状态、发布制品或调用插件。
可执行文件
已安装的可执行文件
| 命令 | 类型 | 暴露范围 | 备注 |
|---|---|---|---|
git-mediate | cli | 全局可执行文件 |
新鲜度
版本和新鲜度
这些信号区分页生成时间、软件包管理器活动和上游发布比较。只有存在证据 URL 和可比较版本时，才会提示版本落后。
页面生成时间2026-07-25
管理器版本1.1.0
管理器更新时间2026-07-22
本地数据OK
上游当前
检测到的最新版本1.1.0
https://github.com/Peaker/git-mediate
- OK没有生成新鲜度警告。
安装元数据
软件包元数据
| 软件包键 | brew:git-mediate |
|---|---|
| 版本 | 1.1.0 |
| 软件包管理器 | Homebrew |
| 软件包管理器页面 | https://formulae.brew.sh/formula/git-mediate |
| 主页 | https://github.com/Peaker/git-mediate |
| 仓库 | https://github.com/Peaker/git-mediate |
| 上游文档 | https://github.com/Peaker/git-mediate#readme |
| 许可证 | GPL-2.0-only |
| 源码归档 | https://github.com/Peaker/git-mediate/archive/refs/tags/1.1.0.tar.gz |
| 最后更新 | 2026-07-22T05:53:20Z |
| Pulse | updated |
| 依赖 | gmp |
| 构建依赖 | cabal-install, ghc |
| macOS 提供的库 | libffi |
| Bottle | 可用 (于 arm64_linux, arm64_sequoia, arm64_sonoma, arm64_tahoe, sonoma, x86_64_linux) |
| Homebrew post-install | 未定义 |
| 服务 | 未声明 |
注册表事实
源数据库详情
| Source Database | Homebrew formula API |
|---|---|
| Tap | homebrew/core |
| Full Name | git-mediate |
| Version Scheme | 0 |
| Revision | 0 |
| Bottle Stable Root URL | https://ghcr.io/v2/homebrew/core |
| Deprecated | no |
| Disabled | no |
| Keg Only | no |
| URL Keys |
|
源数据库匹配
其他软件包管理器记录
匹配项来自外部软件包管理器索引，并与本地 Automic Vault 软件包链接分开显示。
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 依赖
- normalized package name match
- 匹配方式：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 依赖
- normalized package name match
- 匹配方式：Git Mediate
来源线索
由仓库数据生成
此页面由 av-web 从 scripts/generate-pkg-sqlite.py 生成的私有软件包 SQLite 工件提供。
Combined YAML source
View the package source record on GitHub.
使用的来源
- 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