other.nvim
Open alternative files for the current buffer (by rgroli)
diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
| other.nvim | diffconflicts | |
|---|---|---|
| 7 | 16 | |
| 344 | 380 | |
| - | - | |
| 6.0 | 2.4 | |
| 28 days ago | 3 months ago | |
| Lua | Vim Script | |
| MIT License | 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.
other.nvim
Posts with mentions or reviews of other.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-06-22.
-
Can I jump to opened buffer instead of display is in current window?
Check out harpoon and other.nvim for improving your workflow. I've only used harpoon and am really satisfied with using it. other is on my checklist, so you might also test it out.
-
Your favourite Neovim plugins?
Author of other.nvim here, thanks for the mention :)
-
Update to other.nvim - extensive rails mappings and visual overhaul
I just updated my plugin https://github.com/rgroli/other.nvim with extensive improvement for the built-in rails-mappings, including support for the minitest and rspec testframeworks.
-
New Plugin: telescope-alternate
Hey, this looks great! Just yesterday I was looking at other.nvim and I thought, "This looks useful, but I wish it integrated with telescope.nvim."
- What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
-
other.nvim - open alternative files for the current buffer.
You find it here: other.nvim
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 other.nvim and diffconflicts you can also consider the following projects:
mason-nvim-dap.nvim
lazygit.nvim - Plugin for calling lazygit from within neovim.
leap.nvim - Neovim's answer to the mouse 🦘
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
registers.nvim - 📑 Neovim plugin to preview the contents of the registers
conflict-marker.vim - Weapon to fight against conflicts in Vim.
toggleterm.nvim - A neovim lua plugin to help easily manage multiple terminal windows
vim-diff-enhanced - Better Diff options for Vim
flash.nvim - Navigate your code with search labels, enhanced character motions and Treesitter integration
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
hydra.nvim - Create custom submodes and menus
neovim - Vim-fork focused on extensibility and usability
other.nvim vs mason-nvim-dap.nvim
diffconflicts vs lazygit.nvim
other.nvim vs leap.nvim
diffconflicts vs vim-mergetool
other.nvim vs registers.nvim
diffconflicts vs conflict-marker.vim
other.nvim vs toggleterm.nvim
diffconflicts vs vim-diff-enhanced
other.nvim vs flash.nvim
diffconflicts vs diff-therapy.nvim
other.nvim vs hydra.nvim
diffconflicts vs neovim