# akinsho/git-conflict.nvim

<https://repo.masters-masters.com/en/repos/akinsho/git-conflict.nvim>

[Home](https://repo.masters-masters.com/en) › [akinsho](https://repo.masters-masters.com/en/owners/akinsho) › [git-conflict.nvim](https://repo.masters-masters.com/en/repos/akinsho/git-conflict.nvim)

akinsho/git-conflict.nvim has 1,370 stars on GitHub. Its RepoMasters card: Beta tier. A plugin to visualise and resolve merge conflicts in neovim Language: Lua.

| Field | Value |
| --- | --- |
| Owner | [akinsho](https://repo.masters-masters.com/en/owners/akinsho) |
| Stars | 1,370 |
| Forks | 73 |
| Language | [Lua](https://repo.masters-masters.com/en/languages/lua) |
| License | None |
| Created | 2022 |
| Tier | [Beta (700 to 1,999 ★)](https://repo.masters-masters.com/en/ranks/box_office) |
| View on GitHub | [akinsho/git-conflict.nvim](https://github.com/akinsho/git-conflict.nvim) |

## Repository

A plugin to visualise and resolve merge conflicts in neovim

The tier for repos with 700 to 1,999 ★. Published odds per card pulled: 6%. Rarity: Rare.

## More repos by akinsho

- [akinsho/toggleterm.nvim · ★ 5,616 · Lua · Stable](https://repo.masters-masters.com/en/repos/akinsho/toggleterm.nvim)
- [akinsho/bufferline.nvim · ★ 4,388 · Lua · RC](https://repo.masters-masters.com/en/repos/akinsho/bufferline.nvim)
- [akinsho/dotfiles · ★ 342 · Lua · Alpha](https://repo.masters-masters.com/en/repos/akinsho/dotfiles)

## Nearby in Lua

- [zbirenbaum/copilot-cmp · ★ 1,374 · Lua · Beta](https://repo.masters-masters.com/en/repos/zbirenbaum/copilot-cmp)
- [wojciech-kulik/xcodebuild.nvim · ★ 1,374 · Lua · Beta](https://repo.masters-masters.com/en/repos/wojciech-kulik/xcodebuild.nvim)
- [Tencent/LuaPanda · ★ 1,373 · Lua · Beta](https://repo.masters-masters.com/en/repos/Tencent/LuaPanda)
- [Vigemus/iron.nvim · ★ 1,368 · Lua · Beta](https://repo.masters-masters.com/en/repos/Vigemus/iron.nvim)
- [vrld/hump · ★ 1,364 · Lua · Beta](https://repo.masters-masters.com/en/repos/vrld/hump)
- [Wansmer/treesj · ★ 1,363 · Lua · Beta](https://repo.masters-masters.com/en/repos/Wansmer/treesj)

---
Data: GitHub · Illustration drawn by RepoMasters from the repo’s ID and its language color.