I made git merge finish itself — in VS Code, in the terminal, and in CI (opens in new tab)
Extension for Visual Studio Code - 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.
Read the original article