conflict-marker.vim
Weapon to fight against conflicts in Vim. (by rhysd)
tig-explorer.vim
Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer. (by iberianpig)
| conflict-marker.vim | tig-explorer.vim | |
|---|---|---|
| 6 | 5 | |
| 460 | 202 | |
| - | - | |
| 0.0 | 0.0 | |
| 6 months ago | 3 months ago | |
| Vim Script | Vim Script | |
| - | MIT 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.
conflict-marker.vim
Posts with mentions or reviews of conflict-marker.vim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-03-30.
- Rhysd/conflict-marker.vim: Weapon to fight against conflicts in Vim
-
what are the must have git plugs? in your opinion
For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.
-
Can someone make a conflict marker plugin in lua please.
To all plugin devs, sometimes highlighting the conflict markers would be great. I would like a similar workflow like in vscode. The closest I found was the following, but unfortunately it's hard to get it to work with a modern color scheme. See the following issue.
- Is there a better way to see git diff in vim?
- I completely agree with him.
-
Is there any better merge conflict resolution available in VIM?
I use this plugin: https://github.com/rhysd/conflict-marker.vim
tig-explorer.vim
Posts with mentions or reviews of tig-explorer.vim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-11-26.
-
This is how I use vim and git, any other tips?
I use tig-explorer which allows to launch tig from vim (not really impressive) but open file from tig back into the parent vim (the interesting bit).
-
Gitui: Terminal UI for Git
Tig combined with this vim plugin is big part of my workflow: https://github.com/iberianpig/tig-explorer.vim
-
what are the must have git plugs? in your opinion
In addition to the above I love tig for quick commit viewing: https://github.com/iberianpig/tig-explorer.vim
-
outrun-vim, simple dark colorscheme with treesitter support
For a git tree, there is a lot of plugin that can be integrated. I use TIG integration with https://github.com/iberianpig/tig-explorer.vim or switch directly to terminal with git log --graph
- A work-in-progress Magit clone for Neovim
What are some alternatives?
When comparing conflict-marker.vim and tig-explorer.vim you can also consider the following projects:
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
diffconflicts - A better Vimdiff Git mergetool
vim-tig - Do a tig in your vim
auto-git-diff - A vim plugin which shows git diff for Git Rebase Interactive
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
tig - Text-mode interface for git
lazygit.nvim - Plugin for calling lazygit from within neovim.
magit - It's Magit! A Git Porcelain inside Emacs.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
conflict-marker.vim vs git-conflict.nvim
tig-explorer.vim vs neogit
conflict-marker.vim vs diffconflicts
tig-explorer.vim vs vim-tig
conflict-marker.vim vs auto-git-diff
tig-explorer.vim vs gitui
conflict-marker.vim vs vim-mergetool
tig-explorer.vim vs tig
conflict-marker.vim vs lazygit.nvim
tig-explorer.vim vs magit
conflict-marker.vim vs vim-fugitive
tig-explorer.vim vs lazygit.nvim