git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
diff-therapy.nvim
resolve those conflicts and have a happy relationship with git (by tjdevries)
Our great sponsors
| git-conflict.nvim | diff-therapy.nvim | |
|---|---|---|
| 10 | 1 | |
| 770 | 78 | |
| - | - | |
| 7.4 | 0.0 | |
| 3 months ago | about 2 years 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
diff-therapy.nvim
Posts with mentions or reviews of diff-therapy.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-05-01.
-
Which tools do you use for Git Conflicts?
u/I_AM_NERD is working on one which is looking really promising: https://github.com/tjdevries/diff-therapy.nvim
What are some alternatives?
When comparing git-conflict.nvim and diff-therapy.nvim 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
tmux - tmux source code
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
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.
conflict3 - Vim plugin for highlighting and resolving diff3-style conflicts
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-floaterm - :computer: Terminal manager for (neo)vim
git-conflict.nvim vs vim-conflicted
diff-therapy.nvim vs diffconflicts
git-conflict.nvim vs vim-mergetool
diff-therapy.nvim vs tmux
git-conflict.nvim vs conflict-marker.vim
diff-therapy.nvim vs vim-fugitive
git-conflict.nvim vs neogit
diff-therapy.nvim vs vim-conflicted
git-conflict.nvim vs diffview.nvim
diff-therapy.nvim vs conflict3
git-conflict.nvim vs lazygit.nvim
diff-therapy.nvim vs vim-floaterm