conflict-marker.vim
agitator.nvim
conflict-marker.vim | agitator.nvim | |
---|---|---|
6 | 2 | |
460 | 58 | |
- | - | |
0.0 | 5.5 | |
6 months ago | about 2 months ago | |
Vim Script | Lua | |
- | MIT 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.
conflict-marker.vim
- 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
agitator.nvim
-
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.
- new neovim plugin with a few git-related functions (blame, open from branch, time-machine)
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
spaceless.nvim - Automatically strip trailing whitespace as you are editing.
diffconflicts - A better Vimdiff Git mergetool
committia.vim - A Vim plugin for more pleasant editing on commit messages
auto-git-diff - A vim plugin which shows git diff for Git Rebase Interactive
vim-merginal - Fugitive extension to manage and merge Git branches
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
op.nvim - 🔑 1Password for Neovim! Built using the 1Password CLI, Go, and Lua.
lazygit.nvim - Plugin for calling lazygit from within neovim.
vim-gh-line - vim plugin that open the link of current line on github
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
tig-explorer.vim - Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.