diffconflicts VS vim-unimpaired

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.

I don't think it moves blocks, but I utilize the venerable vim-unimpaired for basic text movement (and for inserting empty lines from normal mode).

vim-unimpaired gives a mapping for that for ] (and [ to insert an empty lines above the cursor).

I use https://github.com/tpope/vim-unimpaired for this.

Is it possible to install a Vim plugin (like https://github.com/tpope/vim-unimpaired/tree/master)?

HJKL for movement, then mapped arrow keys to this (requires unimpaired): " Normal mode: indent or move line nmap [e nmap ]e nmap << nmap >> " Visual mode: indent or move selection vmap [egv vmap ]egv vmap >gv

Just now I was looking at the manual entry for vim-unimpaired, since I couldn't remember the incantation for swapping two lines. (It's ]e and [e for swap forward and swap backward.)

Switch buffers with :b or the ]b [b bindings from unimpaired.

and a nice toggle remap that I found here to edit Markdown without conceal: vim.keymap.set("n", "tc", ":setlocal =&conceallevel ? 'conceallevel=0' : 'conceallevel=2'", { desc = "[T]oggle [C]onceallevel"} )

imo there are even few plugin authors who actually understand this well, and certainly no distro author does. Some of the few examples of good "vim philosophy" plugins are vim-sneak and vim-unimpaired.

https://github.com/tpope/vim-unimpaired. I still use it a lot and it’s one of the few remaining vimscript plug-ins I have. It is also quite slow to load. It would be fantastic to have a Lua equivalent.