Skip to main content
Original: Geoffrey Huntley ¡ 23/04/2025

​
Summary

Enter rizzler: Your new AI bestie that actually gets Git. 💀 Ugh, merge conflicts: That sinking feeling when Git screams at you? We’ve all been there. Manually fixing those tangled messes? It’s giving… tedious. It’s giving… waste of my precious time. 😩

​
Key Insights

“Enter rizzler: Your new AI bestie that actually gets Git.” — Introducing rizzler as an AI tool for handling Git merge conflicts.
“Less time untangling, more time coding (or scrolling). You’re welcome.” — Highlighting the productivity benefits of using rizzler.
“If a file hits eight merge conflicts and can’t crack one, it’ll tackle the rest and send an ‘oops’ back to Git.” — Explaining how rizzler handles unresolved merge conflicts.

​
Topics

​
Full Article

​
rizzler: stop crying over Git merge conflicts and let AI handle the drama

Author: Geoffrey Huntley
Published: 2025-04-23
Source: https://ghuntley.com/rizzler/
💀 Ugh, merge conflicts: That sinking feeling when Git screams at you? We’ve all been there. Manually fixing those tangled messes? It’s giving… tedious. It’s giving… waste of my precious time. 😩 🚀 Enter rizzler: Your new AI bestie that actually *gets* Git. This ain’t your grandpa’s merge tool. rizzler slides into your Git workflow and uses ✨ AI magic ✨ (think OpenAI, Claude, Gemini, Bedrock - the whole squad) to automatically resolve those annoying merge conflicts. Less time untangling, more time coding (or scrolling). You’re welcome. 😉 Basically, it turns this: 
<<<<<<< HEAD
const message = "Hello from main branch!";
=======
const message = "Waddup from feature branch!";
>>>>>>> feature-branch
Into actual, usable code, letting you get back to the important stuff. ✨

​
🚀 Get Rizzin’: Installation

Ready to ditch the conflict drama? Let’s get you set up. Head on over to the repository below for the source code, installation and configuration instructions:
ghuntley/rizzler Contribute to ghuntley/rizzler development by creating an account on GitHub. — GitHub

​
no cap, how does this work?

The rizzler is a low-level merge driver that can be used as a command-line tool without Git and can be configured into Git itself as a resolver strategy. It queries the LLMs you have configured (there’s a bundle of strategies within, and I’d love for folks to send in more) If a file hits eight merge conflicts and can’t crack one, it’ll tackle the rest and send an “oops” back to Git, halting the merge party. That’s your cue to dust off your favourite editor and resolve that stubborn conflict manually—throwback style, like it’s 2005. On the bright side, successful fixes get cached on disk, cutting down on LLM costs and giving you a productivity boost—no more twiddling thumbs waiting for the LLM to chime in!

​
ps. socials

pps: this is a joke. A thought experiment if you will. What if in the future git commits are automatically done by assistants and the commit message contains information that a client such as rizzler could use for injection into the context window? That starts make things interesting fast. Now we got yours and mine with full context and perhaps a way to traverse all the way back up to JIRA via MCP to determine intent…

​
Key Takeaways

​
Notable Quotes

Enter rizzler: Your new AI bestie that actually gets Git.
Context: Introducing rizzler as an AI tool for handling Git merge conflicts.
Less time untangling, more time coding (or scrolling). You’re welcome.
Context: Highlighting the productivity benefits of using rizzler.
If a file hits eight merge conflicts and can’t crack one, it’ll tackle the rest and send an ‘oops’ back to Git.
Context: Explaining how rizzler handles unresolved merge conflicts.
  • [[topics/openai-api]]
  • [[topics/github-copilot]]
  • [[topics/ai-agents]]

I dream of roombas - thousands of automated AI robots that autonomously maintain codebases

Geoffrey Huntley ¡ explanation ¡ 68% similar

teleporting into the future and robbing yourself of retirement projects

Geoffrey Huntley ¡ explanation ¡ 65% similar

My AI Had Already Fixed the Code Before I Saw It

Dan Shipper (Every) ¡ explanation ¡ 65% similar
Originally published at https://ghuntley.com/rizzler/.