git-conflict.nvim
Conflict Resolver
A plugin to visualize and resolve merge conflicts in Neovim
A plugin to visualise and resolve merge conflicts in neovim
1k stars
2 watching
37 forks
Language: Lua
last commit: 8 months ago
Linked from 1 awesome list
rockerboo/awesome-neovimRelated projects:
| Repository | Description | Stars |
|---|---|---|
 antonk52/bad-practices.nvim | A plugin that identifies and warns about common bad practices in Neovim configuration and coding. | 105 |
 mikesmithgh/git-prompt-string-lualine.nvim | A Neovim plugin that integrates git-prompt-string into the statusline, providing a customizable Git prompt. | 22 |
 moyiz/git-dev.nvim | A plugin for Neovim to open remote Git repositories directly within the editor. | 90 |
 kawre/leetcode.nvim | A Neovim plugin for solving LeetCode problems | 1,192 |
 mong8se/actually.nvim | A tool to provide a suggestion list after auto-completion, helping users choose the correct file instead of an incorrect one. | 56 |
 f-person/git-blame.nvim | A plugin for displaying commit information in Neovim | 927 |
 emmanueltouzery/decisive.nvim | A Neovim plugin to assist with aligning and navigating CSV files. | 91 |
 aaronhallaert/advanced-git-search.nvim | An extension for Neovim that enables searching through Git history by various criteria and displaying relevant commit information. | 344 |
 olimorris/persisted.nvim | A plugin for Neovim that provides session management with features such as branching, autoloading, and Telescope integration. | 456 |
 rutatang/compter.nvim | Extends Neovim's built-in counting functionality to support custom patterns and operations | 26 |
 tanvirtin/vgit.nvim | An extension for Neovim that provides an interface for managing Git repositories and operations. | 597 |
 k2589/lluminate.nvim | A Neovim plugin that enriches the context of copied code with additional information from LSP. | 12 |
 stevanmilic/nvim-lspimport | A plugin that resolves imports for undefined terms in Neovim by using the Language Server Protocol. | 65 |
 tanloong/interlaced.nvim | A plugin for aligning bilingual parallel texts by re-positioning text and applying highlighting. | 7 |
 superbo/fugit2.nvim | A Neovim plugin that provides a graphical user interface for Git version control | 410 |