# akinsho/git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

Repository: https://github.com/akinsho/git-conflict.nvim
Canonical: https://ross.abutalabs.com/products/git-conflictnvim
Language: Lua
License Family: other
Last push: 2024-12-27T22:53:37+00:00

## Health v2 (maintenance only)
Score: 23/100 (v2, computed 2026-09-03T02:20:16.233290+00:00)
- activity 0, release rhythm 8, longevity 100
- inputs: {"age_days": 1635, "days_push": 614, "days_rel": 662, "gap_med": null, "n_releases_24m": 1}
- flags: no_license
- formula: round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10)

## Adoption (not part of the score)
Stars 1366, forks 69 (observed 2026-08-28T04:04:31.356798+00:00)

## What it is
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
- artifact type: plugin
- maturity: active
- function: version-control, developer-tools
- domain: developer-tools, version-control
- platform: editor-plugin
- tags: neovim, git, merge-conflicts, lua

## Member repositories
- akinsho/git-conflict.nvim (main) score 23

## Provenance
- Observed fields: from GitHub, fetched 2026-08-28T04:04:31.356798+00:00.
- Health v2: computed from the inputs above; adoption is never an input.
- Inferred fields (summary, facets, guidance): AI-extracted, prompt v1, taxonomy v1, on 2026-08-30T04:41:11.257281+00:00, confidence not recorded.
  - readme: https://github.com/akinsho/git-conflict.nvim (fetched 2026-08-28T04:04:31.356798+00:00, sha daa5dfac3032)
- Data as of 2026-08-30T08:39:29.467469+00:00.