- Posted on
- Featured Image
A practical, Linux-first guide to AI-assisted Git merge conflict resolution: harden Git settings, install prerequisites, and wire a Bash merge driver that sends base/ours/theirs to a local LLM (Ollama) or hosted API; scope usage via .gitattributes; and keep humans in charge with tests, hooks, rerere, and safe fallbacks. Includes a demo, distro-specific install commands, troubleshooting, and next steps to roll out gradually.