git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
conflict-marker.vim
Weapon to fight against conflicts in Vim. (by rhysd)
Our great sponsors
| git-conflict.nvim | conflict-marker.vim | |
|---|---|---|
| 10 | 6 | |
| 770 | 457 | |
| - | - | |
| 7.4 | 0.0 | |
| 3 months ago | 5 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
conflict-marker.vim
Posts with mentions or reviews of conflict-marker.vim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-03-30.
- Rhysd/conflict-marker.vim: Weapon to fight against conflicts in Vim
-
what are the must have git plugs? in your opinion
For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.
-
Can someone make a conflict marker plugin in lua please.
To all plugin devs, sometimes highlighting the conflict markers would be great. I would like a similar workflow like in vscode. The closest I found was the following, but unfortunately it's hard to get it to work with a modern color scheme. See the following issue.
- Is there a better way to see git diff in vim?
- I completely agree with him.
-
Is there any better merge conflict resolution available in VIM?
I use this plugin: https://github.com/rhysd/conflict-marker.vim
What are some alternatives?
When comparing git-conflict.nvim and conflict-marker.vim you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
diffconflicts - A better Vimdiff Git mergetool
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
auto-git-diff - A vim plugin which shows git diff for Git Rebase Interactive
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
tig-explorer.vim - Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.
git-conflict.nvim vs vim-conflicted
conflict-marker.vim vs diffconflicts
git-conflict.nvim vs vim-mergetool
conflict-marker.vim vs auto-git-diff
git-conflict.nvim vs neogit
conflict-marker.vim vs vim-mergetool
git-conflict.nvim vs diffview.nvim
conflict-marker.vim vs lazygit.nvim
git-conflict.nvim vs lazygit.nvim
conflict-marker.vim vs vim-fugitive
git-conflict.nvim vs vim-fugitive
conflict-marker.vim vs tig-explorer.vim