diffconflicts
diffview.nvim
Our great sponsors
diffconflicts | diffview.nvim | |
---|---|---|
16 | 61 | |
380 | 3,363 | |
- | - | |
2.4 | 6.1 | |
3 months ago | 1 day ago | |
Vim Script | Lua | |
BSD 3-clause "New" or "Revised" License | GNU General Public License v3.0 or later |
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
-
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.
diffview.nvim
-
How to exit all the tabs in Diffview.nvim?
Edit: It appears to be a problem with noice
-
Certain Mapping only when another command was called earlier (lua)
I struggle a bit to put what i want into words but i still try my best.So i got some plugins likehttps://github.com/sindrets/diffview.nvimhttps://github.com/harrisoncramer/gitlab.nvimhttps://github.com/puremourning/vimspectorand so on (but those are the one which i need that "feature" the most).
- Open previous git version of file?
- What IDEA or Vscode feature/function you want to have in neovim eco-system?
-
How to use Git?
In neovim I have a combination of gitsigns and diffview going. I really like the experience of resolving conflicts with diffview, and I just go through the quickfix list populated by gitsigns to handle staging.
- Your favourite Neovim plugins?
-
Should I learn lua? I am a vs code power user, which prevents me from completely adapting neovim, since I always find something is missing in neovim.
1) There's a plugin that does something similar, you can call :DiffviewFileHistory % to use it (% represents the current file).
-
How do you actually analise git diff?
I’ve been using https://github.com/sindrets/diffview.nvim
-
Best Rust editor?
Do try https://github.com/sindrets/diffview.nvim -- I think it's amazing.
-
telescope-diff.nvim - Check diff between files
I believe that comparing files is primarily done in the context of git. Diffview is the best here.
What are some alternatives?
lazygit.nvim - Plugin for calling lazygit from within neovim.
lazygit - simple terminal UI for git commands
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
awesome-neovim - Collections of awesome neovim plugins.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vim-diff-enhanced - Better Diff options for Vim
toggleterm.nvim - A neovim lua plugin to help easily manage multiple terminal windows
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
vim-conflicted - Easy git merge conflict resolution in Vim
neovim - Vim-fork focused on extensibility and usability
octo.nvim - Edit and review GitHub issues and pull requests from the comfort of your favorite editor