git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
vim-flog
A fast, beautiful, and powerful git branch viewer for vim. (by rbong)
| git-conflict.nvim | vim-flog | |
|---|---|---|
| 10 | 10 | |
| 783 | 633 | |
| - | - | |
| 7.4 | 6.6 | |
| 3 months ago | 3 months ago | |
| Lua | Vim Script | |
| - | - |
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
vim-flog
Posts with mentions or reviews of vim-flog.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-07-12.
-
Open previous git version of file?
I also use vim-flog. It is very well integrated with fugitive and makes it very easy to do interactive rebases more generally.
-
Which version of Vim do you use?
rbong/vim-flog
-
Flog v2, the first real Git branch viewer for Vim
flog
-
This is how I use vim and git, any other tips?
I want to mention vim-flog. A great way of seeing the change history for a small piece of code (e.g. a single function).
- neovim plugins that have improved your workflow
- Whenever I'm looking for plugins these days [OC]
-
What git plugin is being used?
That's a useful tip (although I mainly use vim-flog for viewing logs).
-
A simple git plugin in Lua (git-blame, git-browse)
https://github.com/rbong/vim-flog is pretty good and something missing in lua realm.
-
Any git plugin that has same features as VScode Git Graph?
git-flog is another option.
-
Vim Fugitive :Glog - how can I show author name in quickfix window
You could also try vim-flog:
What are some alternatives?
When comparing git-conflict.nvim and vim-flog you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
gv.vim - A git commit browser in Vim
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
git.nvim
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
git-time-lapse - Fork of git-time-lapse: Perforce-style for vim/neovim
git-blame.vim - See Git Blame information in the status bar for the currently selected line.
lazygit.nvim - Plugin for calling lazygit from within neovim.
easypick.nvim - A neovim plugin that lets you easily create Telescope pickers from arbitrary console commands
git-conflict.nvim vs vim-conflicted
vim-flog vs gv.vim
git-conflict.nvim vs vim-mergetool
vim-flog vs diffview.nvim
git-conflict.nvim vs conflict-marker.vim
vim-flog vs git.nvim
git-conflict.nvim vs neogit
vim-flog vs git-time-lapse
git-conflict.nvim vs diffview.nvim
vim-flog vs git-blame.vim
git-conflict.nvim vs lazygit.nvim
vim-flog vs easypick.nvim