vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool (by samoshkin)
git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
| vim-mergetool | git-conflict.nvim | |
|---|---|---|
| 6 | 10 | |
| 281 | 777 | |
| - | - | |
| 0.0 | 7.4 | |
| over 3 years ago | 3 months ago | |
| Vim Script | 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.
vim-mergetool
Posts with mentions or reviews of vim-mergetool.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-07-15.
-
Any plugin to achieve this dual buffer view for diffs?
I'm using diffview.nvim and https://github.com/samoshkin/vim-mergetool for merge conflicts resolving.
-
What git plugin is being used?
For resolving merge conflicts: samoshkin/vim-mergetool
-
what are the must have git plugs? in your opinion
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.
-
Is there a better way to see git diff in vim?
You should also try vim-mergetool .
- Please finally tell me how do you resolve conflicts in (neo)vim?
- Using neovim as a git diff tool
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
What are some alternatives?
When comparing vim-mergetool and git-conflict.nvim you can also consider the following projects:
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
vim-conflicted - Easy git merge conflict resolution in Vim
lazygit - simple terminal UI for git commands
conflict-marker.vim - Weapon to fight against conflicts in Vim.
diffconflicts - A better Vimdiff Git mergetool
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
linediff.vim - A vim plugin to perform diffs on blocks of code
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-mergetool vs diffview.nvim
git-conflict.nvim vs vim-conflicted
vim-mergetool vs lazygit
git-conflict.nvim vs conflict-marker.vim
vim-mergetool vs diffconflicts
git-conflict.nvim vs neogit
vim-mergetool vs vim-fugitive
git-conflict.nvim vs diffview.nvim
vim-mergetool vs linediff.vim
git-conflict.nvim vs lazygit.nvim
vim-mergetool vs vim-conflicted
git-conflict.nvim vs vim-fugitive