diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
quick-scope
Lightning fast left-right movement in Vim (by unblevable)
Our great sponsors
| diffconflicts | quick-scope | |
|---|---|---|
| 16 | 28 | |
| 380 | 1,376 | |
| - | - | |
| 2.4 | 4.6 | |
| 3 months ago | 9 months ago | |
| Vim Script | Vim Script | |
| 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.
quick-scope
Posts with mentions or reviews of quick-scope.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-07-10.
-
F/f/T/t highlight plugin?
Quick scope! https://github.com/unblevable/quick-scope but I don’t think it works in neovim. It’s the best
-
How to move really efficiently in Vim?
QuickScope makes jumping using f/F much quicker by highlighting letters/numbers you can jump to directly or in two jumps using F;/f;. Highly recommended: https://github.com/unblevable/quick-scope
- Fast left-right movement in Vim
-
Weekly Vim tips and tricks thread! #22
Speaking of f and t, one of my favorite plugins is unblevable's quick-scope, which highlights letters to let you jump to any word within the line using f and t in three characters or less.
- Some treesitter related plugins fail when bootstrapping with packer
-
VIM shortcuts but they keep getting crazier (NEWB to PRO)
I almost never used them too until I added this plugin, it made it a lot easier and faster to navigate
-
Here's a question
quick-scope - with vim-sneak -> I am speed
-
moving in insert mode
quickscope / eyeliner (lua version of quickscope)
-
👀 eyeliner.nvim -- Move faster inline with unique f/F indicators
TL;DR: eyeliner.nvim is quick-scope but in Lua. Check it out!
-
Is there a plugin that only highlights the occurrences of f/F/t/T on the same line without providing any hopping feature?
I'm aware of quick-scope and the likes, but those provide hopping.
What are some alternatives?
When comparing diffconflicts and quick-scope you can also consider the following projects:
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-easymotion - Vim motions on speed!
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-sneak - The missing motion for Vim :athletic_shoe:
conflict-marker.vim - Weapon to fight against conflicts in Vim.
nvim-dap-ui - A UI for nvim-dap
vim-diff-enhanced - Better Diff options for Vim
clever-f.vim - Extended f, F, t and T key mappings for Vim.
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
vim-repeat - repeat.vim: enable repeating supported plugin maps with "."
neovim - Vim-fork focused on extensibility and usability
nvim-dap - Debug Adapter Protocol client implementation for Neovim
diffconflicts vs lazygit.nvim
quick-scope vs vim-easymotion
diffconflicts vs vim-mergetool
quick-scope vs vim-sneak
diffconflicts vs conflict-marker.vim
quick-scope vs nvim-dap-ui
diffconflicts vs vim-diff-enhanced
quick-scope vs clever-f.vim
diffconflicts vs diff-therapy.nvim
quick-scope vs vim-repeat
diffconflicts vs neovim
quick-scope vs nvim-dap