vim-visual-multi VS diffconflicts

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

vim-visual-multi (only the multiple-cursor support, I don't care about the other features)

I recommend this one https://github.com/mg979/vim-visual-multi

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

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.

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 🙁

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...

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.

https://github.com/whiteinge/diffconflicts as a merge tool

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.

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.

For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.

have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.

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.