vim-conflicted
Easy git merge conflict resolution in Vim (by christoomey)
diff-therapy.nvim
resolve those conflicts and have a happy relationship with git (by tjdevries)
| vim-conflicted | diff-therapy.nvim | |
|---|---|---|
| 2 | 1 | |
| 271 | 78 | |
| - | - | |
| 0.0 | 0.0 | |
| over 3 years ago | about 2 years ago | |
| Vim Script | Lua | |
| MIT License | 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-conflicted
Posts with mentions or reviews of vim-conflicted.
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?
I have been using https://github.com/christoomey/vim-conflicted for some time now.
-
Using neovim as a git diff tool
I have been very happy with this one, I don't believe I have had to tweak it at all: https://github.com/christoomey/vim-conflicted
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 vim-conflicted and diff-therapy.nvim you can also consider the following projects:
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
diffconflicts - A better Vimdiff Git mergetool
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
tmux - tmux source code
conflict3 - Vim plugin for highlighting and resolving diff3-style conflicts
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-floaterm - :computer: Terminal manager for (neo)vim
gitsigns.nvim - Git integration for buffers
vim-conflicted vs git-conflict.nvim
diff-therapy.nvim vs diffconflicts
vim-conflicted vs diffview.nvim
diff-therapy.nvim vs git-conflict.nvim
vim-conflicted vs vim-mergetool
diff-therapy.nvim vs tmux
vim-conflicted vs conflict3
diff-therapy.nvim vs vim-fugitive
diff-therapy.nvim vs conflict3
diff-therapy.nvim vs vim-floaterm
diff-therapy.nvim vs gitsigns.nvim