-
diffview.nvim
Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
Please explain. I can see on https://github.com/sindrets/diffview.nvim that you can use Tab to cycle through changed files. And then you're right at the conflicts or how does it work?
-
CodeRabbit
CodeRabbit: AI Code Reviews for Developers. Revolutionize your code reviews with AI. CodeRabbit offers PR summaries, code walkthroughs, 1-click suggestions, and AST-based analysis. Boost productivity and code quality across all major languages with each PR.
-
I use akinsho/git-conflict and it does its job: minimal and efficient.
-
So I use https://github.com/kdheepak/lazygit.nvim All of my git workflow is done in lazygit gg opens the float and away I go
-
https://github.com/whiteinge/diffconflicts as a merge tool
-
vim-fugitve and it's great.
-
SaaSHub
SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives
Related posts
-
I use the default file browser in vim (netrw). I know there are plugins that a lot of people like. Should I switch?
-
Using Git From Vim
-
Why I prefer Neovim over VSCode
-
Git workflow with understanding file history (fugitive.vim, gv.vim, vim-flog, .. others?)
-
Vim mergetool – Reimagined Git merge workflow