diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
nvim-scrollbar
Extensible Neovim Scrollbar (by petertriho)
Our great sponsors
| diffconflicts | nvim-scrollbar | |
|---|---|---|
| 16 | 12 | |
| 380 | 775 | |
| - | - | |
| 2.4 | 3.3 | |
| 3 months ago | 11 months ago | |
| Vim Script | Lua | |
| 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.
nvim-scrollbar
Posts with mentions or reviews of nvim-scrollbar.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-06-21.
-
Your favourite Neovim plugins?
"petertriho/nvim-scrollbar" - minimal scrollbar with gitsigns integration. For context, not scrolling
-
nvim-scrollview now supports signs
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)
- Finally. I've got some free time to work on configuring neovim. Here's the effect of about 2 weeks of free time. It finally feels soooooo cozy
-
Im sharing another thing
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 and gitsigns.nvim integration
nvim-scrollbar just gained support for displaying git changes in the sidebar thanks to gitsigns.nvim.
-
search results: inline count + blink - a simple function
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
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
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.
-
what minimap plugin do you use?
I don't use a minimap but this: https://github.com/petertriho/nvim-scrollbar
- Petertriho/nvim-scrollbar: Extensible Neovim Scrollbar
-
nvim-scrollbar: a scrollbar that can show diagnostics and search results
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
What are some alternatives?
When comparing diffconflicts and nvim-scrollbar you can also consider the following projects:
lazygit.nvim - Plugin for calling lazygit from within neovim.
clipboard-image.nvim - Neovim Lua plugin to paste image from clipboard.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
quickfixsigns_vim - Mark quickfix & location list items with signs
conflict-marker.vim - Weapon to fight against conflicts in Vim.
ReplaceWithRegister - Replace text with the contents of a register.
vim-diff-enhanced - Better Diff options for Vim
feline.nvim - A minimal, stylish and customizable statusline for Neovim written in Lua
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
marks.nvim - A better user experience for viewing and interacting with Vim marks.
neovim - Vim-fork focused on extensibility and usability
spaceless.nvim - Automatically strip trailing whitespace as you are editing.
diffconflicts vs lazygit.nvim
nvim-scrollbar vs clipboard-image.nvim
diffconflicts vs vim-mergetool
nvim-scrollbar vs quickfixsigns_vim
diffconflicts vs conflict-marker.vim
nvim-scrollbar vs ReplaceWithRegister
diffconflicts vs vim-diff-enhanced
nvim-scrollbar vs feline.nvim
diffconflicts vs diff-therapy.nvim
nvim-scrollbar vs marks.nvim
diffconflicts vs neovim
nvim-scrollbar vs spaceless.nvim