diffconflicts
vim-fugitive
Our great sponsors
diffconflicts | vim-fugitive | |
---|---|---|
16 | 114 | |
380 | 19,291 | |
- | - | |
2.4 | 8.1 | |
3 months ago | 22 days ago | |
Vim Script | Vim Script | |
BSD 3-clause "New" or "Revised" License | - |
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.
vim-fugitive
-
How to commit part of file in Git
the only reason I do some git stuff in vim and not _always_ in the shell, is because tpope is very thoughtful and fugitive.vim provides nice ways to deal with hunks or hunk partials (visually selecting a range within a hunk, for i.e.)
https://github.com/tpope/vim-fugitive/blob/master/doc/fugiti...
-
GitUI
I agree, navigating blame history is incredibly useful, if only to save you from asking the wrong person about a particular change.
Vim's Fugitive[1] can do this and also in Textmate to. So I would hope that most editor git plugins can.
1. https://github.com/tpope/vim-fugitive
-
What are some plugins that you can't live without?
Git: vim-fugitive and gitsigns.nvim
-
Is it too late to learn emacs as a vim lifer?
You'll want to invest the time in learning Magit, which will change your life once you get the hang of it (and I was a heavy user of Fugitive in Vim previously!), and it's unlikely you'll find a better integration with GDB anywhere else on the planet than with Emacs, though I can't say that empirically. You just need to take the plunge and start learning it, then cut over and take the hit in productivity one day when you're feeling adventurous. You'll ultimately become far more powerful than you've ever been. Especially if you delve into elisp over time. I use Spacemacs, which is bloated and has bugs, but it has so many features that I haven't undertaken the massive endeavor to replace it from scratch yet.
- Fugitive.vim: A Git wrapper so it should be illegal
-
webify.nvim - Open the current file in the remote's web interface (github or gitlab) or yank its URL
For an option that works on Vim, if you already use tpope's vim-fugitive, there's vim-rhubarb (for GitHub) and fugitive-gitlab.vim (for GitLab).
-
Vim users who work without any plugins, how does your vimrc look like?
I replace vim-fugitive with :! git
-
Switching from Emacs. My experience
The only thing I truly miss from Emacs is [Magit](https://magit.vc/) since I still consider it the best git wrapper available. It is just too good. Unfortunately [Neogit](https://github.com/TimUntersberger/neogit) is not quite there yet although I hope it makes it at some point. I didn't like [Fugitive]https://github.com/tpope/vim-fugitive), but I ended up finding a good enough workaround by using [Lazygit](https://github.com/jesseduffield/lazygit) through [Toggleterm](https://github.com/akinsho/toggleterm.nvim).
-
I like Tabasco.
I do think VSCode is a great tool and I recommend it frequently to people, but I still want to set the record straight here. Yes, vim is obviously limited in the sense that as a CLI app it doesn't draw it's own PDF or HTML windows, that's fair. But it can remote control your favorite PDF viewer or browser for roughly the same functionality. I'm currently writing my thesis using vimtex and it's quite smooth. And all the other stuff you mention is implemented quite competently by various plugins like vim-fugitive, coc.nvim, vimspector and copilot.vim.
-
[Neovim] Meilleure intégration GIT pour Neovim?
Edit: je viens de trouver [https://github.com/tpope/vim-fugitive de Val
What are some alternatives?
lazygit.nvim - Plugin for calling lazygit from within neovim.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-diff-enhanced - Better Diff options for Vim
gitsigns.nvim - Git integration for buffers
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
telescope.nvim - Find, Filter, Preview, Pick. All lua, all the time.
neovim - Vim-fork focused on extensibility and usability
lazygit - simple terminal UI for git commands