diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
vim-sneak
The missing motion for Vim :athletic_shoe: (by justinmk)
Our great sponsors
| diffconflicts | vim-sneak | |
|---|---|---|
| 16 | 37 | |
| 380 | 3,160 | |
| - | - | |
| 2.4 | 4.2 | |
| 3 months ago | 2 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.
vim-sneak
Posts with mentions or reviews of vim-sneak.
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?
Why not sneak or easymotion?
- Weekly Vim tips and tricks thread! #24
-
What do you use 's' for in normal mode? vanilla? or something like leap?
I've tried leap et al, but I still come back to sneak, and use that plugin's standard mappings for s and S.
-
Favourite Vim Easter Eggs?
I don't like many Vim plugins, but I absolutely must have sneak: https://github.com/justinmk/vim-sneak
-
Using preconfigured distro vs rolling your own config
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.
-
find-extender.nvim A Plugin that extends the nvim find command
Nice, but you've reinvented the wheel :) https://github.com/goldfeld/vim-seek -> https://github.com/justinmk/vim-sneak -> https://github.com/ggandor/leap.nvim
-
Blog | My Vim Command Workflow
By vim motions, do you mean native motions or extended motions with plugins like vim easymotion and vim sneak? Those are the two I've been trying out recently.
- Leap.nvim: Neovim’s Answer to the Mouse
-
cmdheight = 0 discussion in vim_dev
Please see https://github.com/justinmk/vim-sneak/pull/299
- Vim sneak breaks comma mapped as leader key.
What are some alternatives?
When comparing diffconflicts and vim-sneak 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
hop.nvim - Neovim motions on speed!
conflict-marker.vim - Weapon to fight against conflicts in Vim.
monkeytype - The most customizable typing website with a minimalistic design and a ton of features. Test yourself in various modes, track your progress and improve your speed.
vim-diff-enhanced - Better Diff options for Vim
nvim-tree.lua - A file explorer tree for neovim written in lua
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
quick-scope - Lightning fast left-right movement in Vim
neovim - Vim-fork focused on extensibility and usability
ace-jump-mode - a quick cursor jump mode for emacs
diffconflicts vs lazygit.nvim
vim-sneak vs vim-easymotion
diffconflicts vs vim-mergetool
vim-sneak vs hop.nvim
diffconflicts vs conflict-marker.vim
vim-sneak vs monkeytype
diffconflicts vs vim-diff-enhanced
vim-sneak vs nvim-tree.lua
diffconflicts vs diff-therapy.nvim
vim-sneak vs quick-scope
diffconflicts vs neovim
vim-sneak vs ace-jump-mode