git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
gitsigns.nvim
Git integration for buffers (by lewis6991)
Our great sponsors
| git-conflict.nvim | gitsigns.nvim | |
|---|---|---|
| 10 | 80 | |
| 760 | 4,329 | |
| - | - | |
| 7.4 | 8.7 | |
| 3 months ago | 2 days ago | |
| Lua | Lua | |
| - | MIT License |
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
git-conflict.nvim
Posts with mentions or reviews of git-conflict.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-01-01.
- Ask HN: What is your favorite tool to resolve Git merge conflicts?
-
How do I make treesitter highlight conflict markers properly?
git-conflicts.nvim plugin provides highlighting for conflict markers.
- Neovim - Workflow para Java, C# e JS/TypeScript (Atualização com Neovim 0.8 e LSP)
-
Poll: how do you jump to Git conflict markers?
I use akinsho/git-conflict and it does its job: minimal and efficient.
- Let the IDE wars, uh, continue!
-
Git workflow
git-conflict that puts at your disposal straightforward interfaces to solve merge conflicts
-
Update: Diffview.nvim now has a merge tool!
It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).
- What git plugin is being used?
-
Which tools do you use for Git Conflicts?
Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.
- what are the must have git plugs? in your opinion
gitsigns.nvim
Posts with mentions or reviews of gitsigns.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-18.
-
Please, help with highlights.
those are gitsigns. read :h gitsigns-highlight-groups. i think the first 3 ones (gitsignsadd, gitsignschange, gitsignsdelete) would need their background cleared.
-
Gitsigns thinks that new lines in Windows are differences
I have installed Gitsigns in a Windows machine and when I execute the method diffthis it thinks that the new lines are differences.
-
Algebraic data types in Lua (Almost) post
Lack of tooling/LSP support compared to Lua. A rather popular neovim plugin, gitsigns, recently switched from teal to regular lua for (among other reasons) the tooling.
https://github.com/lewis6991/gitsigns.nvim/commit/4d63d996b0...
-
Benchmarking some of my favourite neovim plugins over time
gitsigns.nvim
-
Introducing multicursors.nvim plugin
The closest one would be gitsigns
-
How to use Git?
you can use gitsigns
-
Your favourite Neovim plugins?
https://github.com/lewis6991/satellite.nvim absolutely amazing choices, visual economy, integration with gitsigns and builtin vim features (marks).
-
Hacky way to return to original window after using gitsign's `diffthis`. There must be a better way to do this.
It's also nice to ask him directly.
-
Async module in Lua for Nvim
For a long time, I have been searching for solutions for asynchrony in Neovim, but what interested me the most was the one provided by gitsigns.nvim. Therefore, I decided to turn it into a separate module to make it easier to use async in Neovim. I have already created some usage examples.
-
[New plugin] deadcolumn.nvim -- gradually show you colorcolumn as you type
Oh, the symbols are provided by gitsigns.nvim and I have set :h statuscolumn so that they appear to the right of the line numbers. The settings are done in plugin/statuscolumn.lua. I put custom single-file scripts under plugin and ftplugin, where they serve as light-weighted mini plugins, you can even find the prototype of deadcolumn.nvim there :)
What are some alternatives?
When comparing git-conflict.nvim and gitsigns.nvim you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
lualine.nvim - A blazing fast and easy to configure neovim statusline plugin written in pure lua.
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
lazygit.nvim - Plugin for calling lazygit from within neovim.
NvChad - Blazing fast Neovim config providing solid defaults and a beautiful UI, enhancing your neovim experience.
git-conflict.nvim vs vim-conflicted
gitsigns.nvim vs vim-fugitive
git-conflict.nvim vs vim-mergetool
gitsigns.nvim vs vim-gitgutter
git-conflict.nvim vs conflict-marker.vim
gitsigns.nvim vs neogit
git-conflict.nvim vs neogit
gitsigns.nvim vs lualine.nvim
git-conflict.nvim vs diffview.nvim
gitsigns.nvim vs gitui
git-conflict.nvim vs lazygit.nvim
gitsigns.nvim vs NvChad