vim-conflicted
vim-mergetool
| vim-conflicted | vim-mergetool | |
|---|---|---|
| 2 | 6 | |
| 271 | 281 | |
| - | - | |
| 0.0 | 0.0 | |
| over 3 years ago | over 3 years ago | |
| Vim Script | Vim Script | |
| MIT License | MIT License |
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
-
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
vim-mergetool
-
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
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
lazygit - simple terminal UI for git commands
conflict3 - Vim plugin for highlighting and resolving diff3-style conflicts
diffconflicts - A better Vimdiff Git mergetool
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
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
lazygit.nvim - Plugin for calling lazygit from within neovim.