spacedentist

spacedentist / resolve.nvim

Public

A Neovim plugin for resolving merge conflicts with conflict marker highlighting and resolution commands.

48
3
100% credibility
Found Feb 04, 2026 at 40 stars -- GitGems finds repos before they trend. Get early access to the next one.
Sign Up Free
AI Analysis
Lua
AI Summary

resolve.nvim is a Neovim tool that automatically detects and highlights git merge conflicts, offering easy navigation, resolution choices, and diff previews.

How It Works

1
🔍 Discover the helper

You learn about a handy tool that fixes messy clashes in shared code files.

2
✅ Add to your editor

You quickly set up the helper in your code editor so it's always there when needed.

3
📂 Open a clashed file

You load a file where your changes and a teammate's got mixed up with confusing markers.

4
🌈 Problems light up

The tool instantly colors your changes green, teammate's blue, and originals yellow for clear visibility.

5
➡️ Hop between spots

Simple key presses let you jump easily to the next or previous clash.

6
Choose your fix
🟢
Keep yours

Hold onto only your version of the changes.

🔵
Take theirs

Switch to your teammate's version.

🟡
Use original

Revert to the shared starting version.

🤝
Save both

Keep changes from you and your teammate.

🗑️
Toss it

Remove the entire clashing section.

🔍
Spot differences

Open a popup to compare exactly what varies.

7
🔄 Clear every clash

Go through all the spots, making choices until none remain.

🎉 Perfect file achieved

Your file is clean and ready, no more confusion from team edits!

Sign up to see the full architecture

6 more

Sign Up Free

Star Growth

See how this repo grew from 40 to 48 stars Sign Up Free
Repurpose This Repo

Repurpose is a Pro feature

Generate ready-to-use prompts for X threads, LinkedIn posts, blog posts, YouTube scripts, and more -- with full repo context baked in.

Unlock Repurpose
AI-Generated Review

What is resolve.nvim?

resolve.nvim is a Lua Neovim plugin that auto-detects git merge conflicts in your buffers, applying semantic highlights to ours, theirs, and base sections that adapt to light/dark themes. It solves the hassle of manually editing conflicted files by offering navigation with ]x/[x, resolution commands like choose ours/theirs/both/base/none, and floating diff views via delta. Users get quickfix lists, matchit % jumping, and buffer-local keymaps under gc, all in standard or diff3 formats.

Why is it gaining traction?

Unlike alternatives, it shines with base-vs-ours/theirs diffs crucial for diff3 merges, shown in syntax-highlighted floating windows without leaving your buffer. Buffer-local activation avoids key clashes in clean files, and customizable highlights link to Diff* groups for seamless neovim github config integration. The three-minute YouTube demo hooks devs tired of squinting at raw markers.

Who should use this?

Neovim users in git-heavy teams resolving frequent merges, like backend devs managing neovim plugins lists or lua configs with branching. Perfect for nvim plugin development workflows or neovim github copilot setups where diff3 provides merge context. Skip if you rarely conflict or prefer external diff tools.

Verdict

Try it for superior nvim resolve conflicts handling—installs cleanly with lazy.nvim or packer.nvim—but its 42 stars and 1.0% credibility score signal early maturity despite polished docs and video guide. Solid for daily use if base diffs matter.

(198 words)

Sign up to read the full AI review Sign Up Free

Similar repos coming soon.