ReplaceWithSameIndentRegister
Replace lines with the contents of a register, keeping the original indent. (by vim-scripts)
diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
| ReplaceWithSameIndentRegister | diffconflicts | |
|---|---|---|
| 1 | 16 | |
| 9 | 380 | |
| - | - | |
| 10.0 | 2.4 | |
| over 9 years ago | 3 months ago | |
| VimL | Vim Script | |
| - | 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.
ReplaceWithSameIndentRegister
Posts with mentions or reviews of ReplaceWithSameIndentRegister.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-09-16.
-
What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
2 essential plugins for me that I don’t see talked about much anymore are vim-scripts/ReplaceWithRegister and vim-scripts/ReplaceWithSameIndentRegister. The vanilla way to do this is not super difficult, delete into the black hole register, then paste. Or visually select, then paste. And afterwards clean up the formatting if necessary. But I do this hundreds of times a day, the convenience of having a dedicated command for it is massive.
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.
What are some alternatives?
When comparing ReplaceWithSameIndentRegister and diffconflicts you can also consider the following projects:
dirbuf.nvim - A file manager for Neovim which lets you edit your filesystem like you edit text
lazygit.nvim - Plugin for calling lazygit from within neovim.
dial.nvim - enhanced increment/decrement plugin for Neovim.
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
nvim-bufdel - A Neovim plugin to improve buffer deletion
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-search-pulse - Easily locate the cursor after a search
vim-diff-enhanced - Better Diff options for Vim
vim-textobj-variable-segment - A text object to turn foo_bar_baz into foo_baz *and* quuxSpamEggs into quuxEggs *and* shine your shoes
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
nvim-miniyank - killring-alike plugin for neovim and vim 8 with no default mappings
neovim - Vim-fork focused on extensibility and usability
ReplaceWithSameIndentRegister vs dirbuf.nvim
diffconflicts vs lazygit.nvim
ReplaceWithSameIndentRegister vs dial.nvim
diffconflicts vs vim-mergetool
ReplaceWithSameIndentRegister vs nvim-bufdel
diffconflicts vs conflict-marker.vim
ReplaceWithSameIndentRegister vs vim-search-pulse
diffconflicts vs vim-diff-enhanced
ReplaceWithSameIndentRegister vs vim-textobj-variable-segment
diffconflicts vs diff-therapy.nvim
ReplaceWithSameIndentRegister vs nvim-miniyank
diffconflicts vs neovim