conflict3
gitsigns.nvim
| conflict3 | gitsigns.nvim | |
|---|---|---|
| 1 | 80 | |
| 9 | 4,388 | |
| - | - | |
| 10.0 | 9.2 | |
| over 6 years ago | 5 days ago | |
| Vim Script | Lua | |
| - | MIT License |
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.
conflict3
-
Which tools do you use for Git Conflicts?
I use https://github.com/mkotha/conflict3 to highlight changes in conflict markers.
gitsigns.nvim
-
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?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
tmux - tmux source code
lualine.nvim - A blazing fast and easy to configure neovim statusline plugin written in pure lua.
vim-unimpaired - unimpaired.vim: Pairs of handy bracket mappings
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
vim-conflicted - Easy git merge conflict resolution in Vim
NvChad - Blazing fast Neovim config providing solid defaults and a beautiful UI, enhancing your neovim experience.