diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
eyeliner.nvim
👀 Move faster with unique f/F indicators. (by jinh0)
Our great sponsors
| diffconflicts | eyeliner.nvim | |
|---|---|---|
| 16 | 8 | |
| 380 | 372 | |
| - | - | |
| 2.4 | 4.8 | |
| 3 months ago | 7 months ago | |
| Vim Script | Lua | |
| BSD 3-clause "New" or "Revised" 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.
eyeliner.nvim
Posts with mentions or reviews of eyeliner.nvim.
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?
I Recently found the "Eyeliner" Plugin. https://github.com/jinh0/eyeliner.nvim
-
hardtime.nvim - A Neovim plugin helping you establish good command workflow and habit
Similarly, I installed the recent plugin called eyeliner, for fast f/F movements : https://github.com/jinh0/eyeliner.nvim
-
flash.nvim: navigate your code with search labels, enhanced character motions and Treesitter integration
Does this essentially replace eyeliner as well?
- Plugin that visualizes distance from cursor in key strokes?
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
As someone else said Replace with Register, I'll suggest Eyeliner: https://github.com/jinh0/eyeliner.nvim
- which jump plugin are you using now?
-
moving in insert mode
quickscope / eyeliner (lua version of quickscope)
-
👀 eyeliner.nvim -- Move faster inline with unique f/F indicators
I finally made a Lua plugin for Neovim! eyeliner.nvim highlights the unique letter in every word on the line you're on, so that you can use f/F to jump to the word you want in 2 keystrokes!
What are some alternatives?
When comparing diffconflicts and eyeliner.nvim you can also consider the following projects:
lazygit.nvim - Plugin for calling lazygit from within neovim.
flash.nvim - Navigate your code with search labels, enhanced character motions and Treesitter integration
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
switch.vim - A simple Vim plugin to switch segments of text with predefined replacements
conflict-marker.vim - Weapon to fight against conflicts in Vim.
hop.nvim - Neovim motions on speed!
vim-diff-enhanced - Better Diff options for Vim
leap.nvim - Neovim's answer to the mouse 🦘
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
clever-f.vim - Extended f, F, t and T key mappings for Vim.
neovim - Vim-fork focused on extensibility and usability
quick-scope - Lightning fast left-right movement in Vim
diffconflicts vs lazygit.nvim
eyeliner.nvim vs flash.nvim
diffconflicts vs vim-mergetool
eyeliner.nvim vs switch.vim
diffconflicts vs conflict-marker.vim
eyeliner.nvim vs hop.nvim
diffconflicts vs vim-diff-enhanced
eyeliner.nvim vs leap.nvim
diffconflicts vs diff-therapy.nvim
eyeliner.nvim vs clever-f.vim
diffconflicts vs neovim
eyeliner.nvim vs quick-scope