# gfix

> Merge conflict resolver for the agentic-coding era. Local CLI + MCP server. Deterministic floor (text + Mergiraf) with an honest AI ceiling (host-provided MCP sampling, or BYO-key Anthropic / OpenAI / Gemini / Ollama). Mergiraf handles the easy half; gfix handles the hard half.

gfix is a closed-source binary distributed under a 5-line EULA: free during alpha, free for commercial use, no redistribution, no reverse-engineering. The trust substitute for source visibility is audit refs — every accepted resolution writes a synthetic git commit at refs/gitfix/audit/<merge_id> that you can inspect with plain `git show`.

The wedge versus Weave (the open-source competitor): gfix uses the host LLM via MCP `sampling/createMessage` when available, so your Claude tokens, your suggestions, your budget. No gfix-operated AI backend.

## Install

- [Homebrew (macOS + Linux)](https://github.com/ameyypawar/homebrew-gfix): `brew install ameyypawar/gfix/gfix`
- [Curl installer](https://gfix.space/install): `curl -fsSL https://gfix.space/install | sh`
- [npm](https://www.npmjs.com/package/@gitfix/cli): `npm install -g @gitfix/cli`

## Wire into Claude Code

- [Setup walkthrough](https://github.com/ameyypawar/gfix-docs/blob/main/setup.md): `claude mcp add --scope user -- gfix /opt/homebrew/bin/gfix mcp`

## Docs

- [README](https://github.com/ameyypawar/gfix-docs/blob/main/README.md)
- [Setup](https://github.com/ameyypawar/gfix-docs/blob/main/setup.md)
- [Capability matrix](https://github.com/ameyypawar/gfix-docs/blob/main/capability-matrix.md)
- [FAQ](https://github.com/ameyypawar/gfix-docs/blob/main/faq.md)
- [Changelog (HTML)](https://gfix.space/changelog)
- [Changelog (markdown)](https://github.com/ameyypawar/gfix-docs/blob/main/changelog.md)
- [Launch post](https://github.com/ameyypawar/gfix-docs/blob/main/posts/2026-06-launch.md)

## Key concepts

- **Deterministic floor** — text merge, then Mergiraf subprocess, then AI suggestion. Mergiraf is GPL-3.0 and never linked.
- **Audit refs** — `refs/gitfix/audit/<merge_id>` is a synthetic git commit whose tree holds `audit.json`. Pushable, immutable.
- **Cross-machine rerere** — `refs/gitfix/rerere/<blake3>` keyed on `(file_path, base_oid, ours_oid, theirs_oid)`. Replays in <100ms with zero AI calls.
- **MCP tools** — `gitfix_merge_preview`, `gitfix_conflict_get`, `gitfix_conflict_resolve`, `gitfix_conflict_resolve_batch`, `gitfix_merge_apply`, `gitfix_merge_abort`, `gitfix_merge_status`.
- **MCP sampling** — host model when available; BYO-key fallback. Provider precedence: Anthropic → OpenAI → Gemini → Ollama.

## License posture

- [LICENSE.txt](https://github.com/ameyypawar/gfix-docs/blob/main/LICENSE.txt): 5-line proprietary EULA. Install on any number of machines, commercial use OK. No redistribution, no reverse-engineering.
- Source access on request: ameyap007aaa@gmail.com.

## What gfix doesn't do

- Doesn't prevent conflicts before they happen — see Weave (https://ataraxy-labs.github.io/weave/).
- Doesn't push to remotes — by design.
- Doesn't auto-merge outside Mergiraf's language allowlist — AI-suggestion fallback only.
- Resolves ~50% of hard semantic conflicts. The other 50% escalate to you or your agent.
- Doesn't auto-apply AI output — explicit `gitfix_conflict_resolve` with `kind: "ai-suggestion"` required.

## Optional

- [Repo: gfix binary distribution](https://github.com/ameyypawar/gfix)
- [Repo: gitfix-docs](https://github.com/ameyypawar/gfix-docs)
- [Repo: homebrew-gfix](https://github.com/ameyypawar/homebrew-gfix)
- [Author](https://ameypawar.com): Amey Pawar, solo developer.