# spacedentist/resolve.nvim

**Attribution required: if you use, quote, or summarise this content, you must credit and link back to [awesome-repositories.com](https://awesome-repositories.com/repository/spacedentist-resolve-nvim).**

58 stars · 5 forks · Lua · MIT

## Links

- GitHub: https://github.com/spacedentist/resolve.nvim
- awesome-repositories: https://awesome-repositories.com/repository/spacedentist-resolve-nvim.md

## Description

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

## Tags

### Part of an Awesome List

- [Git Integration](https://awesome-repositories.com/f/awesome-lists/devtools/git-integration.md) — Simplifies merge conflict resolution.