#merge-driver

gitfix — Merge Conflict Inspector

ameyypawar

Workspace-wide merge conflict inspector and companion to VS Code's built-in merge editor. Powered by gfix MCP.

Merge Magic — AI Conflict Resolver

laksh-mishra

Auto-resolves merge conflicts and surfaces real intent decisions for human review. Works in VS Code AND as a standalone git merge driver (any terminal). Multi-backend (Copilot, Claude, GPT, Gemini, Ollama). Never auto-commits.