pip install n0conflict
I am excited to announce the release of my first open-source software project, n0conflict — an AI-powered merge conflict resolver that automatically resolves merge conflicts to minimize the risk of introducing bugs or errors.
How It Works
START: Developer has a merge conflict in a file
↓
Run: n0conflict resolve app.py --write
↓
Opens the file and finds the conflict markers
↓
Pulls out both versions of the conflicting code
↓
Sends both versions to Claude (Anthropic's AI) with instructions
↓
Claude reads both sides and writes a merged version that preserves both
↓
Writes the result back to the file
↓
END: The conflict is goneWhy Open Source?
I've been really interested in open-source software recently, and I wanted to create something useful for other developers. Merge conflicts are a pain point everyone hits on collaborative projects — I wanted to make resolving them easier and less error-prone.
The idea of open-source is such a cool thing to me: people volunteering to make the world a better place. What most people don't realize is that the entire internet is basically propped up on software that people weren't even paid to create or maintain.
Getting Started
n0conflict is designed to be easy to use and drop into existing workflows. It works as a standalone tool or alongside Git.
pip install n0conflictI'm really proud of this project and I hope it's useful to other developers. If you're interested in learning more or want to contribute, check out the GitHub repository.
If you want to talk about it, I'd love to chat — reach out at nicolasjameskennedy@gmail.com