diffconflicts VS fzf.vim

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.

Fuzzy Finder: fzf.vim (for its speed) along with telescope.nvim (for its ecosystem)

https://github.com/junegunn/fzf.vim

And added my keyboard shortcuts.

There are two plugins allowing us to use fzf in Vim: the native fzf plugin directly installed with fzf, and fzf.vim. The second plugin is built on the first one.

You might be interested in installing the fzf-vim plugin [0]. It has a user-defined command :Maps which can be used to search through all keybindings (you can also do this with just :nmap in vim, but the fzf interface is much nicer). It also provides :Commands. This behaves remarkably like VSCode's command palette.

[0] https://github.com/junegunn/fzf.vim

You'll also need https://github.com/junegunn/fzf.vim (which is imo the only vim plugin that's a must).

I do all my file operations from the command line. But to open and search files I use fzf

Regarding plugins , I am using https://github.com/Donaldttt/fuzzyy because it works in windows, unlike https://github.com/junegunn/fzf.vim

There's a :Buffers command in fzf.vim that I use extensively. It opens a fuzzy-find window with all open buffers in a MRU list.

Thanks to fzf.vim and fzf-lua, everything I learned and copied is from them.

they're likely referring to fzf.vim, the vimscript plugin from the original fzf author that wraps around fzf. there's also fzf-lua nowadays.