nvim-scrollbar VS diffconflicts

"petertriho/nvim-scrollbar" - minimal scrollbar with gitsigns integration. For context, not scrolling

FYI: Compared to petertriho/nvim-scrollbar: it doesn't have mouse support yet(you win); it will cover the buffer content(you win); the handle is split in half when there is a diagnostic hint visible in the current window(you win); it can show the cursor pos within the handle so that I can know the relative pos of my cursor visible in the current window, i.e. the pink bar in the same link. (you miss it)

This feature exists in nvim-scrollbar (https://github.com/petertriho/nvim-scrollbar). I don't know if that plugin has click support though.

nvim-scrollbar just gained support for displaying git changes in the sidebar thanks to gitsigns.nvim.

I do use nvim-hlslens to count search result occurence. What's hindering me to use your function right now is hlslens' integration with nvim-scrollbar

My only wish with it is that [nvim-scrollbar](https://github.com/petertriho/nvim-scrollbar) could behave a bit nicer with it -- the scrollbar jumps a bit when the smooth scroll is animating.

I don't use a minimap but this: https://github.com/petertriho/nvim-scrollbar

Can you guys check and see if it works now? I believe it was probably related to this issue https://github.com/petertriho/nvim-scrollbar/issues/16

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.