vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool (by samoshkin)
diffconflicts
A better Vimdiff Git mergetool (by whiteinge)
| vim-mergetool | diffconflicts | |
|---|---|---|
| 6 | 16 | |
| 281 | 380 | |
| - | - | |
| 0.0 | 2.4 | |
| over 3 years ago | 3 months ago | |
| Vim Script | 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.
vim-mergetool
Posts with mentions or reviews of vim-mergetool.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-07-15.
-
Any plugin to achieve this dual buffer view for diffs?
I'm using diffview.nvim and https://github.com/samoshkin/vim-mergetool for merge conflicts resolving.
-
What git plugin is being used?
For resolving merge conflicts: samoshkin/vim-mergetool
-
what are the must have git plugs? in your opinion
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.
-
Is there a better way to see git diff in vim?
You should also try vim-mergetool .
- Please finally tell me how do you resolve conflicts in (neo)vim?
- Using neovim as a git diff tool
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 vim-mergetool and diffconflicts you can also consider the following projects:
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
lazygit.nvim - Plugin for calling lazygit from within neovim.
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
lazygit - simple terminal UI for git commands
vim-diff-enhanced - Better Diff options for Vim
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
linediff.vim - A vim plugin to perform diffs on blocks of code
neovim - Vim-fork focused on extensibility and usability
vim-conflicted - Easy git merge conflict resolution in Vim
eyeliner.nvim - 👀 Move faster with unique f/F indicators.
vim-mergetool vs git-conflict.nvim
diffconflicts vs lazygit.nvim
vim-mergetool vs diffview.nvim
diffconflicts vs conflict-marker.vim
vim-mergetool vs lazygit
diffconflicts vs vim-diff-enhanced
vim-mergetool vs vim-fugitive
diffconflicts vs diff-therapy.nvim
vim-mergetool vs linediff.vim
diffconflicts vs neovim
vim-mergetool vs vim-conflicted
diffconflicts vs eyeliner.nvim