diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
vim-cool
A very simple plugin that makes hlsearch more useful. (by romainl)
Our great sponsors
| diffconflicts | vim-cool | |
|---|---|---|
| 16 | 24 | |
| 380 | 499 | |
| - | - | |
| 2.4 | 2.0 | |
| 3 months ago | 8 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-cool
Posts with mentions or reviews of vim-cool.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-01-04.
-
auto-hlsearch.nvim: Automatically manage hlsearch
Awesome! Is it like vim-cool but written in Lua?
-
How do you turn off the yellow highlighting after your done with the search?
I use https://github.com/romainl/vim-cool to do it automatically
-
How can I make searching for an empty string actually execute :let @/=""
You can try this plugin: https://github.com/romainl/vim-cool
- Good vim keymaps
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
vim-cool Not sure if there's an easier way to do it than having this plugin, but it disables search highlighting when you're done, and enables again when you search again. Makes me not have to use `:noh`
- set nohlsearch when pressing anything except n or N?
-
Call :noh command at InsertEnter autocmd
You may be interested in the vim-cool plugin, which uses InsertEnter and CursorMoved autocmds to automatically disable search highlighting after you're done with the search.
-
Disable highlight after searching something?
I have heard nice things about vim-cool
-
What are your must-have vim/nvim extensions?
romainl/vim-cool - Disables search highlights after using. Minor but nice.
- What are some of the unique functions you use in your .vimrc?
What are some alternatives?
When comparing diffconflicts and vim-cool you can also consider the following projects:
lazygit.nvim - Plugin for calling lazygit from within neovim.
FiraCode - Free monospaced font with programming ligatures
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-sensible - sensible.vim: Defaults everyone can agree on
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-visual-multi - Multiple cursors plugin for vim/neovim
vim-diff-enhanced - Better Diff options for Vim
firenvim - Embed Neovim in Chrome, Firefox & others.
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
novim-mode - Plugin to make Vim behave more like a 'normal' editor
neovim - Vim-fork focused on extensibility and usability
golden-ratio - Automatic resizing of Vim windows to the golden ratio
diffconflicts vs lazygit.nvim
vim-cool vs FiraCode
diffconflicts vs vim-mergetool
vim-cool vs vim-sensible
diffconflicts vs conflict-marker.vim
vim-cool vs vim-visual-multi
diffconflicts vs vim-diff-enhanced
vim-cool vs firenvim
diffconflicts vs diff-therapy.nvim
vim-cool vs novim-mode
diffconflicts vs neovim
vim-cool vs golden-ratio