diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
vim-visual-multi
Multiple cursors plugin for vim/neovim (by mg979)
Our great sponsors
| diffconflicts | vim-visual-multi | |
|---|---|---|
| 16 | 46 | |
| 380 | 3,800 | |
| - | - | |
| 2.4 | 5.3 | |
| 3 months ago | 5 days ago | |
| Vim Script | Vim Script | |
| BSD 3-clause "New" or "Revised" 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.
diffconflicts
Posts with mentions or reviews of diffconflicts.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-13.
-
Ask HN: Share a shell script you like
diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...
The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].
[dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...
-
Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.
-
Poll: how do you jump to Git conflict markers?
https://github.com/whiteinge/diffconflicts as a merge tool
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
https://github.com/whiteinge/diffconflicts is not unknown, but I think deserves way more attention. It transforms the way you resolve merge conflicts unlike any other tool I've seen.
-
Your git setup for neovim?
For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.
- Here's a question
-
Vim Regex
For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.
-
What have you changed in your VIM workflow recently?
have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.
- Which tools do you use for Git Conflicts?
-
Is there a better way to see git diff in vim?
I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.
vim-visual-multi
Posts with mentions or reviews of vim-visual-multi.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-12-06.
-
What is the best vim motion alternative for this kind of text selection ?
vim-visual-multi has similar motions: in my mapping I go: ctrl+arrow_down > tab to enter selection mode > e to end of word -> y Although the pasting needs to be done to a block. Pasting to new document is ok though
-
Does anyone know some good altermatives for these Vim plugins on Emacs?
vim-visual-multi (only the multiple-cursor support, I don't care about the other features)
- What IDEA or Vscode feature/function you want to have in neovim eco-system?
- Vim cursores multiplos
-
After using Emacs (with evil) for a long time I switched to Neovim.
I recommend this one https://github.com/mg979/vim-visual-multi
- Apply normal command to all regex matches on the same line
-
Simultaneous editing of _some_ instances of a word or sentence
I know people say it's not necessary, but, for me personally, vim-visual-multi has been a vital part of my plugins and I use it QUITE a lot; maybe it's because I'm bad at Vim, but I basically can't live without the plugin
-
List of questions after first week of transitioning to neovim
For 5. I think this is the usual multiple cursor plugin: https://github.com/mg979/vim-visual-multi It's a bit to learn and really powerful, but since it's a plugin and not a core feature it might not play nice with everything else.
- Multi-cursor code editing: An animated introduction
-
Question about folke's which-key and <CR> (`RETURN`)
I think I'm looking in the wrong place unfortunately, seems like the plugin I want to use (vim-visual-multi) may have issues with which-key 🙁
What are some alternatives?
When comparing diffconflicts and vim-visual-multi you can also consider the following projects:
lazygit.nvim - Plugin for calling lazygit from within neovim.
nvim-select-multi-line - Neovim plugin. select multiple lines that are not adjacent.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
neovim - Vim-fork focused on extensibility and usability
conflict-marker.vim - Weapon to fight against conflicts in Vim.
nvim-neoclip.lua - Clipboard manager neovim plugin with telescope integration
vim-diff-enhanced - Better Diff options for Vim
vim-surround - surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
vis - A vi-like editor based on Plan 9's structural regular expressions
neovim - Vim-fork focused on extensibility and usability
vim-commentary - commentary.vim: comment stuff out
diffconflicts vs lazygit.nvim
vim-visual-multi vs nvim-select-multi-line
diffconflicts vs vim-mergetool
vim-visual-multi vs neovim
diffconflicts vs conflict-marker.vim
vim-visual-multi vs nvim-neoclip.lua
diffconflicts vs vim-diff-enhanced
vim-visual-multi vs vim-surround
diffconflicts vs diff-therapy.nvim
vim-visual-multi vs vis
diffconflicts vs neovim
vim-visual-multi vs vim-commentary