git-conflict.nvim
A plugin to visualise and resolve merge conflicts in neovim (by akinsho)
neovim-remote
:ok_hand: Support for --remote and friends. (by mhinz)
Our great sponsors
git-conflict.nvim | neovim-remote | |
---|---|---|
10 | 38 | |
777 | 1,668 | |
- | - | |
7.4 | 0.0 | |
3 months ago | 7 months ago | |
Lua | Python | |
- | 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.
git-conflict.nvim
Posts with mentions or reviews of git-conflict.nvim.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-01-01.
- 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
neovim-remote
Posts with mentions or reviews of neovim-remote.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-04-07.
-
Has anyone managed to get Neovim and Unity working well together?
Notice that this script depends on mhinz/neovim-remote: Support for --remote and friends. (github.com). (nvr as you have notice). The full-path is required to make it work.
-
flatten.nvim - open files from a neovim terminal in your current neovim instance - no more nested neovim sessions!
I am currently using https://github.com/mhinz/neovim-remote with this bit in my zshrc:
-
How can a single LSP server be used for files opened across different neovim instances?
Since they are on different screens I cannot use a single neovim instance (I tried playing around with neovim-remote but seems like that's for the usecase of opening files in one instance from different terminals -- doesn't help). Due to multiple LSP instances changes in one file are not reflected in the other, e.g., file B imports some types from file A; I create a new type in A but since B's neovim instance is not aware of any change to the A file corresponding the LSP fails to see the new type.
-
Announce page 4.0.0 (program which turns neovim into pager) now with simple file picker
This version includes `nv` binary which is [neovim-remote](https://github.com/mhinz/neovim-remote) but rewritten in Rust (I've did it out of boredom) also with interface similar to `page`.
-
neovim: server mode
Practical use case: when navigating in ANY terminal (or tmux) write a function that sends opened files to a single running neovim instance instead of spreading opened vim instances all around like neovim remote does, but works for any terminal
- [help] How to use an nvim process to control another nvim process
-
What's everyone working on this week (38/2022)?
I see the integration with neovim is done via a separate plugin, did you think about adding support for neovim-remote?
- Help understanding pathing
- Keep LSP running in the background.
-
LSP does not recognize changes in other files.
Another way of doing what u/TheLeoP23 suggested is by using https://github.com/mhinz/neovim-remote . This way you have a single neovim instance and you can open it on different terminals and mantain your current workflow.
What are some alternatives?
When comparing git-conflict.nvim and neovim-remote you can also consider the following projects:
vim-conflicted - Easy git merge conflict resolution in Vim
vim-slime - A vim plugin to give you some slime. (Emacs)
vim-mergetool - :cake: Efficient way of using Vim as a Git mergetool
neovide - No Nonsense Neovim Client in Rust
conflict-marker.vim - Weapon to fight against conflicts in Vim.
vim-dispatch - dispatch.vim: Asynchronous build and test dispatcher
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
vimux - easily interact with tmux from vim
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
vim-floaterm - :computer: Terminal manager for (neo)vim
lazygit.nvim - Plugin for calling lazygit from within neovim.
git-conflict.nvim vs vim-conflicted
neovim-remote vs vim-slime
git-conflict.nvim vs vim-mergetool
neovim-remote vs neovide
git-conflict.nvim vs conflict-marker.vim
neovim-remote vs vim-dispatch
git-conflict.nvim vs neogit
neovim-remote vs vimux
git-conflict.nvim vs diffview.nvim
neovim-remote vs vim-floaterm
git-conflict.nvim vs lazygit.nvim
neovim-remote vs lazygit.nvim