akinsho/git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim observed · 2026-08-28
Health v2 · maintenance only
23/100
- Activity 0
- Release rhythm 8
- Longevity 100
Flags: no_license
How is this computed?
round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10) — computed 2026-09-03. Adoption (stars, forks) is never an input.
- gap_med: n/a
- age_days: 1635
- days_rel: 662
- days_push: 614
- n_releases_24m: 1
Adoption not part of the score
1366 stars · 69 forks observed · 2026-08-28
What it is AI-extracted, prompt v1, taxonomy v1, 2026-08-30, confidence not recorded
A Neovim plugin written in Lua that visualizes and helps resolve Git merge conflicts directly in the editor. It highlights conflict markers, provides commands to choose ours/theirs/both/none, navigate between conflicts, and list them in the quickfix window.
Use cases
- resolve git merge conflicts in neovim
- highlight conflict markers in vim
- navigate between merge conflicts quickly
- choose ours or theirs for conflicted hunks
- list all conflicts in a quickfix window
When to choose
- you use Neovim 0.7+ and regularly deal with Git merge conflicts
- you want visual highlighting and keybindings for resolving conflicts without leaving the editor
When to avoid
- you use an editor other than Neovim
- you need a standalone GUI merge-conflict resolution tool
Facets
plugin · maturity active
version-control developer-tools developer-tools version-control editor-plugin neovim git merge-conflicts lua
1 source
- readme: https://github.com/akinsho/git-conflict.nvim · fetched 2026-08-28 · daa5dfac3032
Member repositories
| Repository | Role | Health v2 |
|---|---|---|
| akinsho/git-conflict.nvim | main | 23 |
For agents
markdown · JSON · MCP: product_card(name="akinsho/git-conflict.nvim")
Data as of 2026-08-30T08:39:29.467469+00:00 · Report a problem