git-conflict.nvim
conflict3
Our great sponsors
| git-conflict.nvim | conflict3 | |
|---|---|---|
| 10 | 1 | |
| 770 | 9 | |
| - | - | |
| 7.4 | 10.0 | |
| 3 months ago | over 6 years ago | |
| Lua | Vim Script | |
| - | - |
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.
git-conflict.nvim
- Ask HN: What is your favorite tool to resolve Git merge conflicts?
-
How do I make treesitter highlight conflict markers properly?
git-conflicts.nvim plugin provides highlighting for conflict markers.
- Neovim - Workflow para Java, C# e JS/TypeScript (Atualização com Neovim 0.8 e LSP)
-
Poll: how do you jump to Git conflict markers?
I use akinsho/git-conflict and it does its job: minimal and efficient.
- Let the IDE wars, uh, continue!
-
Git workflow
git-conflict that puts at your disposal straightforward interfaces to solve merge conflicts
-
Update: Diffview.nvim now has a merge tool!
It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).
- What git plugin is being used?
-
Which tools do you use for Git Conflicts?
Maybe give https://github.com/akinsho/git-conflict.nvim a try, another alternative could be fugitive by tpope iirc.
- what are the must have git plugs? in your opinion
conflict3
-
Which tools do you use for Git Conflicts?
I use https://github.com/mkotha/conflict3 to highlight changes in conflict markers.
What are some alternatives?
vim-conflicted - Easy git merge conflict resolution in Vim
diff-therapy.nvim - resolve those conflicts and have a happy relationship with git
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
conflict-marker.vim - Weapon to fight against conflicts in Vim.
tmux - tmux source code
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vim-unimpaired - unimpaired.vim: Pairs of handy bracket mappings
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
lazygit.nvim - Plugin for calling lazygit from within neovim.
gitsigns.nvim - Git integration for buffers