phase 3 features, live in v0.99.
eight things the built-in merge editor doesn’t do. (and we still use the built-in editor — gitfix complements it, doesn’t replace it.)
- Workspace-wide conflict treeAn activity-bar panel lists every <<<<<< marker across every folder in your workspace. Multi-repo monorepos get one unified view.
- Five one-click strategiesTake ours · take theirs · run mergiraf · ai suggestion · take target. Each conflict, each hunk, your choice. Bulk apply across files when patterns repeat.
- CodeLens above every markerInline buttons appear directly above each <<<<<< line. Resolve without leaving the diff.
- AI suggestions, your providerRoutes through vscode.lm (copilot, etc.) when available. Bring your own key for anthropic, openai, or ollama — keys live in vs code secret storage.
- Multi-folder workspacesOpen three repos in one window? gitfix tracks merges independently per folder and applies your per-repo strategy from .gitfix/config.toml.
- Rerere replay badgesWhen git rerere has seen this conflict before, gitfix shows a badge and previews the replay so you can confirm before accepting.
- Tamper-evident audit trailEvery resolution is recorded under refs/gitfix/audit/* — a separate ref namespace you can push, review, or prove in CI. Manage it from the audit webview.
- Opt-in telemetryOff by default. Honors vs code's telemetry switch. Schema is published; transport is stubbed in v0.99 (logs to output channel only). See /privacy for the event list.
three ways to install.
[ ! ] v0.99.0 is published to the pre-release channel. enable "pre-release version" in vs code to receive it.
- 01VS Code Marketplace →
click → install → enable "pre-release version" in the extension settings.
- 02Open VSX (vscodium / cursor / windsurf) →
drop-in for non-microsoft distributions of vs code.
- 03Command line
$ code --install-extension ameyypawar.gitfix --pre-releasethe --pre-release flag is what unlocks v0.99 until the v1.0 tag ships.
free, mit-licensed, source on github.
gitfix the extension is mit-licensed and developed in the open at github.com/ameyypawar/gitfix. the underlying gfix cli + mcp server is a separate project at gfix.space.
